[TASK] Remove unused ExtJS NavigationDummy frame. 67/43767/2
authorBenjamin Kott <benjamin.kott@outlook.com>
Sat, 3 Oct 2015 19:27:30 +0000 (21:27 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Sun, 4 Oct 2015 12:26:51 +0000 (14:26 +0200)
Resolves: #70331
Releases: master
Change-Id: I99a83a5adfc63bdecaebff3a581acaa2a8cd4bc5
Reviewed-on: http://review.typo3.org/43767
Reviewed-by: Michael Oehlhof <typo3@oehlhof.de>
Tested-by: Michael Oehlhof <typo3@oehlhof.de>
Reviewed-by: Daniel Goerz <ervaude@gmail.com>
Tested-by: Daniel Goerz <ervaude@gmail.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Build/Resources/Public/Less/TYPO3/_element_docheader.less
typo3/sysext/backend/Resources/Public/JavaScript/extjs/viewport.js
typo3/sysext/backend/Resources/Public/JavaScript/extjs/viewportConfiguration.js
typo3/sysext/backend/Resources/Public/JavaScript/modulemenu.js
typo3/sysext/t3skin/Resources/Public/Css/backend.css

index 39f4481..8fcdcc0 100644 (file)
 //
 
 #typo3-navigationContainer-xsplit,
-#typo3-navigationContainer-xcollapsed,
-#typo3-navigationDummy {
+#typo3-navigationContainer-xcollapsed {
        background: @body-bg url(../../Public/Images/docheader-split-background.png) left top repeat-x;
 }
 
index 75754cc..d4fdf68 100644 (file)
@@ -109,13 +109,6 @@ TYPO3.Viewport = Ext.extend(Ext.Viewport, {
        NavigationContainer: null,
 
        /**
-        * Dummy panel, shown when no NavigationContainer is in use
-        *
-        * @var Ext.Panel
-        */
-       NavigationDummy: null,
-
-       /**
         * The iframe navigation component
         *
         * @var TYPO3.iframePanel
@@ -153,7 +146,6 @@ TYPO3.Viewport = Ext.extend(Ext.Viewport, {
 
                this.ContentContainer = Ext.getCmp('typo3-contentContainer');
                this.NavigationContainer = Ext.getCmp('typo3-navigationContainer');
-               this.NavigationDummy = Ext.getCmp('typo3-navigationDummy');
                this.NavigationIframe = Ext.getCmp('typo3-navigationIframe');
                this.Topbar = Ext.getCmp('typo3-topbar');
                this.ModuleMenuContainer = Ext.getCmp('typo3-module-menu');
index 2d83d28..5ca36c9 100644 (file)
@@ -138,16 +138,6 @@ TYPO3.Viewport.configuration = {
                                        layout: 'border',
                                        items: [
                                                {
-                                                       id: 'typo3-navigationDummy',
-                                                       region: 'west',
-                                                       layout: 'fit',
-                                                       border: false,
-                                                       hidden: true,
-                                                       floatable: true,
-                                                       xtime: 'iframePanel',
-                                                       width: 5
-                                               },
-                                               {
                                                        id: 'typo3-contentContainerWrapper',
                                                        border: false,
                                                        layout: 'fit',
index 0fe07a2..ba1c996 100644 (file)
@@ -106,17 +106,14 @@ TYPO3.ModuleMenu.App = {
                var mod = record.name;
                if (record.navigationComponentId) {
                        this.loadNavigationComponent(record.navigationComponentId);
-                       TYPO3.Backend.NavigationDummy.hide();
                        TYPO3.Backend.NavigationIframe.getEl().parent().setStyle('overflow', 'auto');
                } else if (record.navigationFrameScript) {
-                       TYPO3.Backend.NavigationDummy.hide();
                        TYPO3.Backend.NavigationContainer.show();
                        this.loadNavigationComponent('typo3-navigationIframe');
                        this.openInNavFrame(record.navigationFrameScript, record.navigationFrameScriptParam);
                        TYPO3.Backend.NavigationIframe.getEl().parent().setStyle('overflow', 'hidden');
                } else {
                        TYPO3.Backend.NavigationContainer.hide();
-                       TYPO3.Backend.NavigationDummy.show();
                }
 
                this.highlightModuleMenuItem(mod);
index 890ce90..acb79b8 100644 (file)
@@ -9537,8 +9537,7 @@ div#contentMenu1 {
   border-bottom: 1px solid #C3C3C3;
 }
 #typo3-navigationContainer-xsplit,
-#typo3-navigationContainer-xcollapsed,
-#typo3-navigationDummy {
+#typo3-navigationContainer-xcollapsed {
   background: #ffffff url(../../Public/Images/docheader-split-background.png) left top repeat-x;
 }
 #typo3-navigationContainer-xcollapsed {