Bug 33646

This commit is contained in:
Julia Radzhabova 2016-12-13 15:33:28 +03:00
parent 5ea7c5965e
commit 6c75dbabde
9 changed files with 29 additions and 32 deletions

View file

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

View file

@ -178,18 +178,15 @@ define([
); );
var me = this; var me = this;
this.panels = {}; me.panels = {
require(['documenteditor/main/app/view/FileMenuPanels'], function(){
me.panels = {
// 'saveas' : (new DE.Views.FileMenuPanels.ViewSaveAs({menu:me})).render(), // 'saveas' : (new DE.Views.FileMenuPanels.ViewSaveAs({menu:me})).render(),
'opts' : (new DE.Views.FileMenuPanels.Settings({menu:me})).render(), 'opts' : (new DE.Views.FileMenuPanels.Settings({menu:me})).render(),
'info' : (new DE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(), 'info' : (new DE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(),
'rights' : (new DE.Views.FileMenuPanels.DocumentRights({menu:me})).render(), 'rights' : (new DE.Views.FileMenuPanels.DocumentRights({menu:me})).render(),
'help' : (new DE.Views.FileMenuPanels.Help({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; return this;
}, },

View file

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

View file

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

View file

@ -175,18 +175,15 @@ define([
); );
var me = this; var me = this;
this.panels = {}; me.panels = {
require(['presentationeditor/main/app/view/FileMenuPanels'], function(){ 'saveas' : (new PE.Views.FileMenuPanels.ViewSaveAs({menu:me})).render(),
me.panels = { 'opts' : (new PE.Views.FileMenuPanels.Settings({menu:me})).render(),
'saveas' : (new PE.Views.FileMenuPanels.ViewSaveAs({menu:me})).render(), 'info' : (new PE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(),
'opts' : (new PE.Views.FileMenuPanels.Settings({menu:me})).render(), 'rights' : (new PE.Views.FileMenuPanels.DocumentRights({menu:me})).render(),
'info' : (new PE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(), 'help' : (new PE.Views.FileMenuPanels.Help({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; return this;
}, },

View file

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

View file

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

View file

@ -162,18 +162,15 @@ define([
); );
var me = this; var me = this;
this.panels = {}; me.panels = {
require(['spreadsheeteditor/main/app/view/FileMenuPanels'], function(){ 'saveas' : (new SSE.Views.FileMenuPanels.ViewSaveAs({menu:me})).render(),
me.panels = { 'opts' : (new SSE.Views.FileMenuPanels.Settings({menu:me})).render(),
'saveas' : (new SSE.Views.FileMenuPanels.ViewSaveAs({menu:me})).render(), 'info' : (new SSE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(),
'opts' : (new SSE.Views.FileMenuPanels.Settings({menu:me})).render(), 'rights' : (new SSE.Views.FileMenuPanels.DocumentRights({menu:me})).render(),
'info' : (new SSE.Views.FileMenuPanels.DocumentInfo({menu:me})).render(), 'help' : (new SSE.Views.FileMenuPanels.Help({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; return this;
}, },

View file

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