[TASK] RTE: Add to skin css and image required by jQuery UI Resizable 80/35280/3
authorStanislas Rolland <typo3@sjbr.ca>
Thu, 11 Dec 2014 03:03:47 +0000 (22:03 -0500)
committerStanislas Rolland <typo3@sjbr.ca>
Thu, 11 Dec 2014 03:10:22 +0000 (04:10 +0100)
Releases: master
Resolves: #63758
Change-Id: I880002fcc6c2b9e5f44f67e6ab838486d4e4726a
Reviewed-on: http://review.typo3.org/35280
Reviewed-by: Stanislas Rolland <typo3@sjbr.ca>
Tested-by: Stanislas Rolland <typo3@sjbr.ca>
typo3/sysext/rtehtmlarea/Classes/Controller/FrontendRteController.php
typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php
typo3/sysext/rtehtmlarea/Resources/Public/Css/Skin/jquery-ui-resizable.css [new file with mode: 0644]
typo3/sysext/rtehtmlarea/Resources/Public/Images/jquery/ui-icons_222222_256x240.png [new file with mode: 0644]
typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/HTMLArea/Editor/Framework.js
typo3/sysext/t3skin/rtehtmlarea/images/jquery/ui-icons_222222_256x240.png [new file with mode: 0644]
typo3/sysext/t3skin/rtehtmlarea/jquery-ui-resizable.css [new file with mode: 0644]

index 7abfe44..ec82366 100644 (file)
@@ -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);
index 7e1566e..1069c43 100644 (file)
@@ -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
diff --git a/typo3/sysext/rtehtmlarea/Resources/Public/Css/Skin/jquery-ui-resizable.css b/typo3/sysext/rtehtmlarea/Resources/Public/Css/Skin/jquery-ui-resizable.css
new file mode 100644 (file)
index 0000000..1e39e5d
--- /dev/null
@@ -0,0 +1,82 @@
+/*! 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
diff --git a/typo3/sysext/rtehtmlarea/Resources/Public/Images/jquery/ui-icons_222222_256x240.png b/typo3/sysext/rtehtmlarea/Resources/Public/Images/jquery/ui-icons_222222_256x240.png
new file mode 100644 (file)
index 0000000..688e641
Binary files /dev/null and b/typo3/sysext/rtehtmlarea/Resources/Public/Images/jquery/ui-icons_222222_256x240.png differ
index a71131a..743264e 100644 (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,
diff --git a/typo3/sysext/t3skin/rtehtmlarea/images/jquery/ui-icons_222222_256x240.png b/typo3/sysext/t3skin/rtehtmlarea/images/jquery/ui-icons_222222_256x240.png
new file mode 100644 (file)
index 0000000..688e641
Binary files /dev/null and b/typo3/sysext/t3skin/rtehtmlarea/images/jquery/ui-icons_222222_256x240.png differ
diff --git a/typo3/sysext/t3skin/rtehtmlarea/jquery-ui-resizable.css b/typo3/sysext/t3skin/rtehtmlarea/jquery-ui-resizable.css
new file mode 100644 (file)
index 0000000..0cb5f4a
--- /dev/null
@@ -0,0 +1,82 @@
+/*! 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