From 6c75dbabdeabd9d0f953aac5a1359909317829cf Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 13 Dec 2016 15:33:28 +0300 Subject: [PATCH] Bug 33646 --- apps/documenteditor/main/app.js | 1 + apps/documenteditor/main/app/view/FileMenu.js | 17 +++++++---------- apps/documenteditor/main/app_dev.js | 1 + apps/presentationeditor/main/app.js | 1 + .../main/app/view/FileMenu.js | 19 ++++++++----------- apps/presentationeditor/main/app_dev.js | 1 + apps/spreadsheeteditor/main/app.js | 1 + .../main/app/view/FileMenu.js | 19 ++++++++----------- apps/spreadsheeteditor/main/app_dev.js | 1 + 9 files changed, 29 insertions(+), 32 deletions(-) diff --git a/apps/documenteditor/main/app.js b/apps/documenteditor/main/app.js index 40df85e8ab..6160cf1903 100644 --- a/apps/documenteditor/main/app.js +++ b/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', diff --git a/apps/documenteditor/main/app/view/FileMenu.js b/apps/documenteditor/main/app/view/FileMenu.js index d9a6eed046..292dc34c55 100644 --- a/apps/documenteditor/main/app/view/FileMenu.js +++ b/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; }, diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js index c4a8a9888c..92212bc32f 100644 --- a/apps/documenteditor/main/app_dev.js +++ b/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', diff --git a/apps/presentationeditor/main/app.js b/apps/presentationeditor/main/app.js index f241c26f6d..18a13c411b 100644 --- a/apps/presentationeditor/main/app.js +++ b/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', diff --git a/apps/presentationeditor/main/app/view/FileMenu.js b/apps/presentationeditor/main/app/view/FileMenu.js index da463c62d5..39364b3c1a 100644 --- a/apps/presentationeditor/main/app/view/FileMenu.js +++ b/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.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.$el.find('.content-box').hide(); return this; }, diff --git a/apps/presentationeditor/main/app_dev.js b/apps/presentationeditor/main/app_dev.js index d3e8cfecda..1348fc7b5e 100644 --- a/apps/presentationeditor/main/app_dev.js +++ b/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', diff --git a/apps/spreadsheeteditor/main/app.js b/apps/spreadsheeteditor/main/app.js index b1640b1192..70cd97b97b 100644 --- a/apps/spreadsheeteditor/main/app.js +++ b/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', diff --git a/apps/spreadsheeteditor/main/app/view/FileMenu.js b/apps/spreadsheeteditor/main/app/view/FileMenu.js index ff7b248c51..0c58d1bb36 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenu.js +++ b/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.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.$el.find('.content-box').hide(); return this; }, diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js index 74387f0d2a..690ac2a92a 100644 --- a/apps/spreadsheeteditor/main/app_dev.js +++ b/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',