Commit dc15b723 authored by Stanislas Rolland's avatar Stanislas Rolland
Browse files

[TASK] RTE: Add to skin css and image required by jQuery UI Resizable

Releases: master
Resolves: #63758
Change-Id: I880002fcc6c2b9e5f44f67e6ab838486d4e4726a
Reviewed-on: http://review.typo3.org/35280


Reviewed-by: default avatarStanislas Rolland <typo3@sjbr.ca>
Tested-by: default avatarStanislas Rolland <typo3@sjbr.ca>
parent 288b0f57
......@@ -218,14 +218,12 @@ class FrontendRteController extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaBase {
$this->pageRenderer->loadExtJs();
$this->pageRenderer->enableExtJSQuickTips();
}
$this->pageRenderer->addJsFile($this->getFullFileName('typo3/js/extjs/ux/ext.resizable.js'));
$this->pageRenderer->addJsFile('sysext/backend/Resources/Public/JavaScript/notifications.js');
// Preloading the pageStyle and including RTE skin stylesheets
$this->addPageStyle();
$this->pageRenderer->addCssFile($this->siteURL . 'typo3/contrib/extjs/resources/css/ext-all-notheme.css');
$this->pageRenderer->addCssFile($this->siteURL . 'typo3/sysext/t3skin/extjs/xtheme-t3skin.css');
$this->addSkin();
$this->pageRenderer->addCssFile($this->siteURL . 'typo3/js/extjs/ux/resize.css');
// Add RTE JavaScript
$this->pageRenderer->loadJquery();
$this->addRteJsFiles($this->TCEform->RTEcounter);
......
......@@ -476,7 +476,6 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
// Add RTE JavaScript
$this->addRteJsFiles($this->TCEform->RTEcounter);
$this->pageRenderer->addJsFile($this->buildJSMainLangFile($this->TCEform->RTEcounter));
//$this->pageRenderer->loadRequireJsModule('TYPO3/CMS/Rtehtmlarea/HTMLArea/HTMLArea');
$this->pageRenderer->addJsInlineCode('HTMLArea-init', $this->getRteInitJsCode(), TRUE);
/* =======================================
* DRAW THE EDITOR
......@@ -554,6 +553,8 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
// Editing area style sheet
$this->editedContentCSS = $skinDir . '/htmlarea-edited-content.css';
$this->addStyleSheet('rtehtmlarea-editing-area-skin', $this->editedContentCSS);
// jQuery UI Resizable style sheet
$this->addStyleSheet('jquery-ui-resizable', $skinDir . '/jquery-ui-resizable.css');
// Main skin
$this->addStyleSheet('rtehtmlarea-skin', $this->editorCSS);
// Additional icons from registered plugins
......
/*! jQuery UI - v1.11.2 - 2014-10-16
* http://jqueryui.com
* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
.ui-resizable {
position: relative;
}
.ui-resizable-handle {
position: absolute;
font-size: 0.1px;
display: block;
-ms-touch-action: none;
touch-action: none;
}
.ui-resizable-disabled .ui-resizable-handle,
.ui-resizable-autohide .ui-resizable-handle {
display: none;
}
.ui-resizable-n {
cursor: n-resize;
height: 7px;
width: 100%;
top: -5px;
left: 0;
}
.ui-resizable-s {
cursor: s-resize;
height: 7px;
width: 100%;
bottom: -5px;
left: 0;
}
.ui-resizable-e {
cursor: e-resize;
width: 7px;
right: -5px;
top: 0;
height: 100%;
}
.ui-resizable-w {
cursor: w-resize;
width: 7px;
left: -5px;
top: 0;
height: 100%;
}
.ui-resizable-se {
cursor: se-resize;
width: 12px;
height: 12px;
right: 1px;
bottom: 1px;
}
.ui-resizable-sw {
cursor: sw-resize;
width: 9px;
height: 9px;
left: -5px;
bottom: -5px;
}
.ui-resizable-nw {
cursor: nw-resize;
width: 9px;
height: 9px;
left: -5px;
top: -5px;
}
.ui-resizable-ne {
cursor: ne-resize;
width: 9px;
height: 9px;
right: -5px;
top: -5px;
}
.ui-icon {
width: 16px;
height: 16px;
}
.ui-icon,
.ui-widget-content .ui-icon {
background-image: url("../../Images/jquery/ui-icons_222222_256x240.png");
}
.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
\ No newline at end of file
......@@ -201,7 +201,6 @@ define('TYPO3/CMS/Rtehtmlarea/HTMLArea/Editor/Framework',
makeResizable: function () {
if (this.resizable) {
var self = this;
Dom.addClass(this.getEl(), 'resizable');
this.resizer = Resizable.makeResizable(this.getEl(), {
minHeight: 200,
minWidth: 300,
......
/*! jQuery UI - v1.11.2 - 2014-10-16
* http://jqueryui.com
* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
.ui-resizable {
position: relative;
}
.ui-resizable-handle {
position: absolute;
font-size: 0.1px;
display: block;
-ms-touch-action: none;
touch-action: none;
}
.ui-resizable-disabled .ui-resizable-handle,
.ui-resizable-autohide .ui-resizable-handle {
display: none;
}
.ui-resizable-n {
cursor: n-resize;
height: 7px;
width: 100%;
top: -5px;
left: 0;
}
.ui-resizable-s {
cursor: s-resize;
height: 7px;
width: 100%;
bottom: -5px;
left: 0;
}
.ui-resizable-e {
cursor: e-resize;
width: 7px;
right: -5px;
top: 0;
height: 100%;
}
.ui-resizable-w {
cursor: w-resize;
width: 7px;
left: -5px;
top: 0;
height: 100%;
}
.ui-resizable-se {
cursor: se-resize;
width: 12px;
height: 12px;
right: 1px;
bottom: 1px;
}
.ui-resizable-sw {
cursor: sw-resize;
width: 9px;
height: 9px;
left: -5px;
bottom: -5px;
}
.ui-resizable-nw {
cursor: nw-resize;
width: 9px;
height: 9px;
left: -5px;
top: -5px;
}
.ui-resizable-ne {
cursor: ne-resize;
width: 9px;
height: 9px;
right: -5px;
top: -5px;
}
.ui-icon {
width: 16px;
height: 16px;
}
.ui-icon,
.ui-widget-content .ui-icon {
background-image: url("images/jquery/ui-icons_222222_256x240.png");
}
.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment