Bug 33646

apps/documenteditor/main/app.js

@@ -178,6 +178,7 @@ require([
         'documenteditor/main/app/controller/RightMenu',
         'documenteditor/main/app/controller/LeftMenu',
         'documenteditor/main/app/controller/Main',
+        'documenteditor/main/app/view/FileMenuPanels',
         'documenteditor/main/app/view/ParagraphSettings',
         'documenteditor/main/app/view/HeaderFooterSettings',
         'documenteditor/main/app/view/ImageSettings',

apps/documenteditor/main/app/view/FileMenu.js

@@ -178,18 +178,15 @@ define([
             );
 
             var me = this;
-            this.panels = {};
-            require(['documenteditor/main/app/view/FileMenuPanels'], function(){
-                me.panels = {
+            me.panels = {
 //                    'saveas'    : (new DE.Views.FileMenuPanels.ViewSaveAs({menu:me})).render(),
-                    'opts'      : (new DE.Views.FileMenuPanels.Settings({menu:me})).render(),
-                    'info'      : (new DE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(),
-                    'rights'    : (new DE.Views.FileMenuPanels.DocumentRights({menu:me})).render(),
-                    'help'      : (new DE.Views.FileMenuPanels.Help({menu:me})).render()
-                };
+                'opts'      : (new DE.Views.FileMenuPanels.Settings({menu:me})).render(),
+                'info'      : (new DE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(),
+                'rights'    : (new DE.Views.FileMenuPanels.DocumentRights({menu:me})).render(),
+                'help'      : (new DE.Views.FileMenuPanels.Help({menu:me})).render()
+            };
 
-                me.$el.find('.content-box').hide();
-            });
+            me.$el.find('.content-box').hide();
 
             return this;
         },

apps/documenteditor/main/app_dev.js

@@ -168,6 +168,7 @@ require([
         'documenteditor/main/app/controller/RightMenu',
         'documenteditor/main/app/controller/LeftMenu',
         'documenteditor/main/app/controller/Main',
+        'documenteditor/main/app/view/FileMenuPanels',
         'documenteditor/main/app/view/ParagraphSettings',
         'documenteditor/main/app/view/HeaderFooterSettings',
         'documenteditor/main/app/view/ImageSettings',

apps/presentationeditor/main/app.js

@@ -172,6 +172,7 @@ require([
         'presentationeditor/main/app/controller/RightMenu',
         'presentationeditor/main/app/controller/LeftMenu',
         'presentationeditor/main/app/controller/Main',
+        'presentationeditor/main/app/view/FileMenuPanels',
         'presentationeditor/main/app/view/ParagraphSettings',
         'presentationeditor/main/app/view/ImageSettings',
         'presentationeditor/main/app/view/ShapeSettings',

apps/presentationeditor/main/app/view/FileMenu.js

@@ -175,18 +175,15 @@ define([
             );
 
             var me = this;
-            this.panels = {};
-            require(['presentationeditor/main/app/view/FileMenuPanels'], function(){
-                me.panels = {
-                    'saveas'    : (new PE.Views.FileMenuPanels.ViewSaveAs({menu:me})).render(),
-                    'opts'      : (new PE.Views.FileMenuPanels.Settings({menu:me})).render(),
-                    'info'      : (new PE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(),
-                    'rights'    : (new PE.Views.FileMenuPanels.DocumentRights({menu:me})).render(),
-                    'help'      : (new PE.Views.FileMenuPanels.Help({menu:me})).render()
-                };
-
-                me.$el.find('.content-box').hide();
-            });
+            me.panels = {
+                'saveas'    : (new PE.Views.FileMenuPanels.ViewSaveAs({menu:me})).render(),
+                'opts'      : (new PE.Views.FileMenuPanels.Settings({menu:me})).render(),
+                'info'      : (new PE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(),
+                'rights'    : (new PE.Views.FileMenuPanels.DocumentRights({menu:me})).render(),
+                'help'      : (new PE.Views.FileMenuPanels.Help({menu:me})).render()
+            };
+
+            me.$el.find('.content-box').hide();
 
             return this;
         },

apps/presentationeditor/main/app_dev.js

@@ -163,6 +163,7 @@ require([
         'presentationeditor/main/app/controller/RightMenu',
         'presentationeditor/main/app/controller/LeftMenu',
         'presentationeditor/main/app/controller/Main',
+        'presentationeditor/main/app/view/FileMenuPanels',
         'presentationeditor/main/app/view/ParagraphSettings',
         'presentationeditor/main/app/view/ImageSettings',
         'presentationeditor/main/app/view/ShapeSettings',

apps/spreadsheeteditor/main/app.js

@@ -174,6 +174,7 @@ require([
         'spreadsheeteditor/main/app/controller/LeftMenu',
         'spreadsheeteditor/main/app/controller/Main',
         'spreadsheeteditor/main/app/controller/Print',
+        'spreadsheeteditor/main/app/view/FileMenuPanels',
         'spreadsheeteditor/main/app/view/ParagraphSettings',
         'spreadsheeteditor/main/app/view/ImageSettings',
         'spreadsheeteditor/main/app/view/ChartSettings',

apps/spreadsheeteditor/main/app/view/FileMenu.js

@@ -162,18 +162,15 @@ define([
             );
 
             var me = this;
-            this.panels = {};
-            require(['spreadsheeteditor/main/app/view/FileMenuPanels'], function(){
-                me.panels = {
-                    'saveas'    : (new SSE.Views.FileMenuPanels.ViewSaveAs({menu:me})).render(),
-                    'opts'      : (new SSE.Views.FileMenuPanels.Settings({menu:me})).render(),
-                    'info'      : (new SSE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(),
-                    'rights'    : (new SSE.Views.FileMenuPanels.DocumentRights({menu:me})).render(),
-                    'help'      : (new SSE.Views.FileMenuPanels.Help({menu:me})).render()
-                };
-
-                me.$el.find('.content-box').hide();
-            });
+            me.panels = {
+                'saveas'    : (new SSE.Views.FileMenuPanels.ViewSaveAs({menu:me})).render(),
+                'opts'      : (new SSE.Views.FileMenuPanels.Settings({menu:me})).render(),
+                'info'      : (new SSE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(),
+                'rights'    : (new SSE.Views.FileMenuPanels.DocumentRights({menu:me})).render(),
+                'help'      : (new SSE.Views.FileMenuPanels.Help({menu:me})).render()
+            };
+
+            me.$el.find('.content-box').hide();
 
             return this;
         },

apps/spreadsheeteditor/main/app_dev.js

@@ -164,6 +164,7 @@ require([
         'spreadsheeteditor/main/app/controller/LeftMenu',
         'spreadsheeteditor/main/app/controller/Main',
         'spreadsheeteditor/main/app/controller/Print',
+        'spreadsheeteditor/main/app/view/FileMenuPanels',
         'spreadsheeteditor/main/app/view/ParagraphSettings',
         'spreadsheeteditor/main/app/view/ImageSettings',
         'spreadsheeteditor/main/app/view/ChartSettings',