diff --git a/apps/documenteditor/main/app.js b/apps/documenteditor/main/app.js index 963a99082..bd53d3271 100644 --- a/apps/documenteditor/main/app.js +++ b/apps/documenteditor/main/app.js @@ -169,44 +169,46 @@ require([ ] }); - Common.Locale.apply(); - - require([ - 'documenteditor/main/app/controller/Viewport', - 'documenteditor/main/app/controller/DocumentHolder', - 'documenteditor/main/app/controller/Toolbar', - 'documenteditor/main/app/controller/Statusbar', - 'documenteditor/main/app/controller/Links', - 'documenteditor/main/app/controller/Navigation', - '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', - 'documenteditor/main/app/view/TableSettings', - 'documenteditor/main/app/view/ShapeSettings', - 'documenteditor/main/app/view/TextArtSettings', - 'documenteditor/main/app/view/SignatureSettings', - 'common/main/lib/util/utils', - 'common/main/lib/util/LocalStorage', - 'common/main/lib/controller/Fonts', - 'common/main/lib/controller/History' - /** coauthoring begin **/ - ,'common/main/lib/controller/Comments' - ,'common/main/lib/controller/Chat' - /** coauthoring end **/ - ,'common/main/lib/controller/Plugins' - ,'documenteditor/main/app/view/ChartSettings' - ,'common/main/lib/controller/ExternalDiagramEditor' - ,'common/main/lib/controller/ExternalMergeEditor' - ,'common/main/lib/controller/ReviewChanges' - ,'common/main/lib/controller/Protection' - ,'common/main/lib/controller/Desktop' - ], function() { - app.start(); - }); + Common.Locale.apply( + function() { + require([ + 'documenteditor/main/app/controller/Viewport', + 'documenteditor/main/app/controller/DocumentHolder', + 'documenteditor/main/app/controller/Toolbar', + 'documenteditor/main/app/controller/Statusbar', + 'documenteditor/main/app/controller/Links', + 'documenteditor/main/app/controller/Navigation', + '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', + 'documenteditor/main/app/view/TableSettings', + 'documenteditor/main/app/view/ShapeSettings', + 'documenteditor/main/app/view/TextArtSettings', + 'documenteditor/main/app/view/SignatureSettings', + 'common/main/lib/util/utils', + 'common/main/lib/util/LocalStorage', + 'common/main/lib/controller/Fonts', + 'common/main/lib/controller/History' + /** coauthoring begin **/ + ,'common/main/lib/controller/Comments' + ,'common/main/lib/controller/Chat' + /** coauthoring end **/ + ,'common/main/lib/controller/Plugins' + ,'documenteditor/main/app/view/ChartSettings' + ,'common/main/lib/controller/ExternalDiagramEditor' + ,'common/main/lib/controller/ExternalMergeEditor' + ,'common/main/lib/controller/ReviewChanges' + ,'common/main/lib/controller/Protection' + ,'common/main/lib/controller/Desktop' + ], function() { + app.start(); + }); + } + ); }, function(err) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { reqerr = window.requireTimeourError(); diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js index feb54f25a..ea9a07eba 100644 --- a/apps/documenteditor/main/app_dev.js +++ b/apps/documenteditor/main/app_dev.js @@ -159,45 +159,47 @@ require([ ] }); - Common.Locale.apply(); - - require([ - 'documenteditor/main/app/controller/Viewport', - 'documenteditor/main/app/controller/DocumentHolder', - 'documenteditor/main/app/controller/Toolbar', - 'documenteditor/main/app/controller/Links', - 'documenteditor/main/app/controller/Navigation', - 'documenteditor/main/app/controller/Statusbar', - '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', - 'documenteditor/main/app/view/TableSettings', - 'documenteditor/main/app/view/ShapeSettings', - 'documenteditor/main/app/view/TextArtSettings', - 'documenteditor/main/app/view/SignatureSettings', - 'common/main/lib/util/utils', - 'common/main/lib/util/LocalStorage', - 'common/main/lib/controller/Fonts', - 'common/main/lib/controller/History' - /** coauthoring begin **/ - ,'common/main/lib/controller/Comments' - ,'common/main/lib/controller/Chat' - /** coauthoring end **/ - ,'common/main/lib/controller/Plugins' - ,'documenteditor/main/app/view/ChartSettings' - ,'common/main/lib/controller/ExternalDiagramEditor' - ,'common/main/lib/controller/ExternalMergeEditor' - ,'common/main/lib/controller/ReviewChanges' - ,'common/main/lib/controller/Protection' - ,'common/main/lib/controller/Desktop' - ], function() { - window.compareVersions = true; - app.start(); - }); + Common.Locale.apply( + function() { + require([ + 'documenteditor/main/app/controller/Viewport', + 'documenteditor/main/app/controller/DocumentHolder', + 'documenteditor/main/app/controller/Toolbar', + 'documenteditor/main/app/controller/Links', + 'documenteditor/main/app/controller/Navigation', + 'documenteditor/main/app/controller/Statusbar', + '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', + 'documenteditor/main/app/view/TableSettings', + 'documenteditor/main/app/view/ShapeSettings', + 'documenteditor/main/app/view/TextArtSettings', + 'documenteditor/main/app/view/SignatureSettings', + 'common/main/lib/util/utils', + 'common/main/lib/util/LocalStorage', + 'common/main/lib/controller/Fonts', + 'common/main/lib/controller/History' + /** coauthoring begin **/ + ,'common/main/lib/controller/Comments' + ,'common/main/lib/controller/Chat' + /** coauthoring end **/ + ,'common/main/lib/controller/Plugins' + ,'documenteditor/main/app/view/ChartSettings' + ,'common/main/lib/controller/ExternalDiagramEditor' + ,'common/main/lib/controller/ExternalMergeEditor' + ,'common/main/lib/controller/ReviewChanges' + ,'common/main/lib/controller/Protection' + ,'common/main/lib/controller/Desktop' + ], function() { + window.compareVersions = true; + app.start(); + }); + } + ); }, function(err) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { reqerr = window.requireTimeourError();