From fe2d9f515446d2d45df036a46923c67fdf186a95 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 18 Sep 2019 13:53:29 +0300 Subject: [PATCH] [PE][SSE][Mobile] Fix loading translations on IE and minimized version --- apps/documenteditor/mobile/app-dev.js | 60 +++++++++--------- apps/documenteditor/mobile/app.js | 58 +++++++++--------- apps/presentationeditor/main/app.js | 66 ++++++++++---------- apps/presentationeditor/main/app_dev.js | 68 ++++++++++----------- apps/presentationeditor/mobile/app-dev.js | 62 +++++++++---------- apps/presentationeditor/mobile/app.js | 60 +++++++++--------- apps/spreadsheeteditor/main/app.js | 72 +++++++++++----------- apps/spreadsheeteditor/main/app_dev.js | 74 +++++++++++------------ apps/spreadsheeteditor/mobile/app-dev.js | 64 ++++++++++---------- apps/spreadsheeteditor/mobile/app.js | 62 +++++++++---------- 10 files changed, 323 insertions(+), 323 deletions(-) diff --git a/apps/documenteditor/mobile/app-dev.js b/apps/documenteditor/mobile/app-dev.js index db28adc5d9..b5ab499510 100644 --- a/apps/documenteditor/mobile/app-dev.js +++ b/apps/documenteditor/mobile/app-dev.js @@ -155,8 +155,6 @@ require([ ] }); - Common.Locale.apply(); - var device = Framework7.prototype.device; var loadPlatformCss = function (filename, opt){ var fileref = document.createElement('link'); @@ -198,34 +196,36 @@ require([ //Load platform styles loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css'); - require([ - 'common/main/lib/util/LocalStorage', - 'common/main/lib/util/utils', - 'common/mobile/lib/controller/Plugins', - 'documenteditor/mobile/app/controller/Editor', - 'documenteditor/mobile/app/controller/Toolbar', - 'documenteditor/mobile/app/controller/Search', - 'documenteditor/mobile/app/controller/Main', - 'documenteditor/mobile/app/controller/DocumentHolder', - 'documenteditor/mobile/app/controller/Settings', - 'documenteditor/mobile/app/controller/edit/EditContainer', - 'documenteditor/mobile/app/controller/edit/EditText', - 'documenteditor/mobile/app/controller/edit/EditParagraph', - 'documenteditor/mobile/app/controller/edit/EditHeader', - 'documenteditor/mobile/app/controller/edit/EditTable', - 'documenteditor/mobile/app/controller/edit/EditImage', - 'documenteditor/mobile/app/controller/edit/EditShape', - 'documenteditor/mobile/app/controller/edit/EditChart', - 'documenteditor/mobile/app/controller/edit/EditHyperlink', - 'documenteditor/mobile/app/controller/add/AddContainer', - 'documenteditor/mobile/app/controller/add/AddTable', - 'documenteditor/mobile/app/controller/add/AddShape', - 'documenteditor/mobile/app/controller/add/AddImage', - 'documenteditor/mobile/app/controller/add/AddOther', - 'common/mobile/lib/controller/Collaboration' - ], function() { - window.compareVersions = true; - app.start(); + Common.Locale.apply(function() { + require([ + 'common/main/lib/util/LocalStorage', + 'common/main/lib/util/utils', + 'common/mobile/lib/controller/Plugins', + 'documenteditor/mobile/app/controller/Editor', + 'documenteditor/mobile/app/controller/Toolbar', + 'documenteditor/mobile/app/controller/Search', + 'documenteditor/mobile/app/controller/Main', + 'documenteditor/mobile/app/controller/DocumentHolder', + 'documenteditor/mobile/app/controller/Settings', + 'documenteditor/mobile/app/controller/edit/EditContainer', + 'documenteditor/mobile/app/controller/edit/EditText', + 'documenteditor/mobile/app/controller/edit/EditParagraph', + 'documenteditor/mobile/app/controller/edit/EditHeader', + 'documenteditor/mobile/app/controller/edit/EditTable', + 'documenteditor/mobile/app/controller/edit/EditImage', + 'documenteditor/mobile/app/controller/edit/EditShape', + 'documenteditor/mobile/app/controller/edit/EditChart', + 'documenteditor/mobile/app/controller/edit/EditHyperlink', + 'documenteditor/mobile/app/controller/add/AddContainer', + 'documenteditor/mobile/app/controller/add/AddTable', + 'documenteditor/mobile/app/controller/add/AddShape', + 'documenteditor/mobile/app/controller/add/AddImage', + 'documenteditor/mobile/app/controller/add/AddOther', + 'common/mobile/lib/controller/Collaboration' + ], function() { + window.compareVersions = true; + app.start(); + }); }); }, function(err) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { diff --git a/apps/documenteditor/mobile/app.js b/apps/documenteditor/mobile/app.js index cfd2b1b40f..dba0a47b41 100644 --- a/apps/documenteditor/mobile/app.js +++ b/apps/documenteditor/mobile/app.js @@ -166,8 +166,6 @@ require([ ] }); - Common.Locale.apply(); - var device = Framework7.prototype.device; var loadPlatformCss = function (filename, opt){ var fileref = document.createElement('link'); @@ -209,33 +207,35 @@ require([ //Load platform styles loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css'); - require([ - 'common/main/lib/util/LocalStorage', - 'common/main/lib/util/utils', - 'common/mobile/lib/controller/Plugins', - 'documenteditor/mobile/app/controller/Editor', - 'documenteditor/mobile/app/controller/Toolbar', - 'documenteditor/mobile/app/controller/Search', - 'documenteditor/mobile/app/controller/Main', - 'documenteditor/mobile/app/controller/DocumentHolder', - 'documenteditor/mobile/app/controller/Settings', - 'documenteditor/mobile/app/controller/edit/EditContainer', - 'documenteditor/mobile/app/controller/edit/EditText', - 'documenteditor/mobile/app/controller/edit/EditParagraph', - 'documenteditor/mobile/app/controller/edit/EditHeader', - 'documenteditor/mobile/app/controller/edit/EditTable', - 'documenteditor/mobile/app/controller/edit/EditImage', - 'documenteditor/mobile/app/controller/edit/EditShape', - 'documenteditor/mobile/app/controller/edit/EditChart', - 'documenteditor/mobile/app/controller/edit/EditHyperlink', - 'documenteditor/mobile/app/controller/add/AddContainer', - 'documenteditor/mobile/app/controller/add/AddTable', - 'documenteditor/mobile/app/controller/add/AddShape', - 'documenteditor/mobile/app/controller/add/AddImage', - 'documenteditor/mobile/app/controller/add/AddOther', - 'common/mobile/lib/controller/Collaboration' - ], function() { - app.start(); + Common.Locale.apply(function() { + require([ + 'common/main/lib/util/LocalStorage', + 'common/main/lib/util/utils', + 'common/mobile/lib/controller/Plugins', + 'documenteditor/mobile/app/controller/Editor', + 'documenteditor/mobile/app/controller/Toolbar', + 'documenteditor/mobile/app/controller/Search', + 'documenteditor/mobile/app/controller/Main', + 'documenteditor/mobile/app/controller/DocumentHolder', + 'documenteditor/mobile/app/controller/Settings', + 'documenteditor/mobile/app/controller/edit/EditContainer', + 'documenteditor/mobile/app/controller/edit/EditText', + 'documenteditor/mobile/app/controller/edit/EditParagraph', + 'documenteditor/mobile/app/controller/edit/EditHeader', + 'documenteditor/mobile/app/controller/edit/EditTable', + 'documenteditor/mobile/app/controller/edit/EditImage', + 'documenteditor/mobile/app/controller/edit/EditShape', + 'documenteditor/mobile/app/controller/edit/EditChart', + 'documenteditor/mobile/app/controller/edit/EditHyperlink', + 'documenteditor/mobile/app/controller/add/AddContainer', + 'documenteditor/mobile/app/controller/add/AddTable', + 'documenteditor/mobile/app/controller/add/AddShape', + 'documenteditor/mobile/app/controller/add/AddImage', + 'documenteditor/mobile/app/controller/add/AddOther', + 'common/mobile/lib/controller/Collaboration' + ], function() { + app.start(); + }); }); }, function(err) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { diff --git a/apps/presentationeditor/main/app.js b/apps/presentationeditor/main/app.js index f7b37369fe..99ea4dc019 100644 --- a/apps/presentationeditor/main/app.js +++ b/apps/presentationeditor/main/app.js @@ -160,39 +160,39 @@ require([ ] }); - Common.Locale.apply(); - - require([ - 'presentationeditor/main/app/controller/Viewport', - 'presentationeditor/main/app/controller/DocumentHolder', - 'presentationeditor/main/app/controller/Toolbar', - 'presentationeditor/main/app/controller/Statusbar', - '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', - 'presentationeditor/main/app/view/SlideSettings', - 'presentationeditor/main/app/view/TableSettings', - 'presentationeditor/main/app/view/TextArtSettings', - 'presentationeditor/main/app/view/SignatureSettings', - 'common/main/lib/util/utils', - 'common/main/lib/util/LocalStorage', - 'common/main/lib/controller/Fonts' - /** coauthoring begin **/ - ,'common/main/lib/controller/Comments', - 'common/main/lib/controller/Chat', - /** coauthoring end **/ - 'common/main/lib/controller/Plugins', - 'presentationeditor/main/app/view/ChartSettings', - 'common/main/lib/controller/ExternalDiagramEditor' - ,'common/main/lib/controller/ReviewChanges' - ,'common/main/lib/controller/Protection' - ,'common/main/lib/controller/Desktop' - ], function() { - app.start(); + Common.Locale.apply(function(){ + require([ + 'presentationeditor/main/app/controller/Viewport', + 'presentationeditor/main/app/controller/DocumentHolder', + 'presentationeditor/main/app/controller/Toolbar', + 'presentationeditor/main/app/controller/Statusbar', + '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', + 'presentationeditor/main/app/view/SlideSettings', + 'presentationeditor/main/app/view/TableSettings', + 'presentationeditor/main/app/view/TextArtSettings', + 'presentationeditor/main/app/view/SignatureSettings', + 'common/main/lib/util/utils', + 'common/main/lib/util/LocalStorage', + 'common/main/lib/controller/Fonts' + /** coauthoring begin **/ + ,'common/main/lib/controller/Comments', + 'common/main/lib/controller/Chat', + /** coauthoring end **/ + 'common/main/lib/controller/Plugins', + 'presentationeditor/main/app/view/ChartSettings', + 'common/main/lib/controller/ExternalDiagramEditor' + ,'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) { diff --git a/apps/presentationeditor/main/app_dev.js b/apps/presentationeditor/main/app_dev.js index ef7679451f..278c6bcf05 100644 --- a/apps/presentationeditor/main/app_dev.js +++ b/apps/presentationeditor/main/app_dev.js @@ -151,40 +151,40 @@ require([ ] }); - Common.Locale.apply(); - - require([ - 'presentationeditor/main/app/controller/Viewport', - 'presentationeditor/main/app/controller/DocumentHolder', - 'presentationeditor/main/app/controller/Toolbar', - 'presentationeditor/main/app/controller/Statusbar', - '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', - 'presentationeditor/main/app/view/SlideSettings', - 'presentationeditor/main/app/view/TableSettings', - 'presentationeditor/main/app/view/TextArtSettings', - 'presentationeditor/main/app/view/SignatureSettings', - 'common/main/lib/util/utils', - 'common/main/lib/util/LocalStorage', - 'common/main/lib/controller/Fonts' - /** coauthoring begin **/ - ,'common/main/lib/controller/Comments', - 'common/main/lib/controller/Chat', - /** coauthoring end **/ - 'common/main/lib/controller/Plugins', - 'presentationeditor/main/app/view/ChartSettings', - 'common/main/lib/controller/ExternalDiagramEditor' - ,'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([ + 'presentationeditor/main/app/controller/Viewport', + 'presentationeditor/main/app/controller/DocumentHolder', + 'presentationeditor/main/app/controller/Toolbar', + 'presentationeditor/main/app/controller/Statusbar', + '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', + 'presentationeditor/main/app/view/SlideSettings', + 'presentationeditor/main/app/view/TableSettings', + 'presentationeditor/main/app/view/TextArtSettings', + 'presentationeditor/main/app/view/SignatureSettings', + 'common/main/lib/util/utils', + 'common/main/lib/util/LocalStorage', + 'common/main/lib/controller/Fonts' + /** coauthoring begin **/ + ,'common/main/lib/controller/Comments', + 'common/main/lib/controller/Chat', + /** coauthoring end **/ + 'common/main/lib/controller/Plugins', + 'presentationeditor/main/app/view/ChartSettings', + 'common/main/lib/controller/ExternalDiagramEditor' + ,'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) { diff --git a/apps/presentationeditor/mobile/app-dev.js b/apps/presentationeditor/mobile/app-dev.js index 575778b44f..4870f02afc 100644 --- a/apps/presentationeditor/mobile/app-dev.js +++ b/apps/presentationeditor/mobile/app-dev.js @@ -153,8 +153,6 @@ require([ ] }); - Common.Locale.apply(); - var device = Framework7.prototype.device; var loadPlatformCss = function (filename, opt){ var fileref = document.createElement('link'); @@ -193,36 +191,38 @@ require([ //Load platform styles loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css'); - require([ - 'common/main/lib/util/LocalStorage', - 'common/main/lib/util/utils', - 'common/mobile/lib/controller/Plugins', - 'presentationeditor/mobile/app/controller/Editor', - 'presentationeditor/mobile/app/controller/Toolbar', - 'presentationeditor/mobile/app/controller/Search', - 'presentationeditor/mobile/app/controller/Main', - 'presentationeditor/mobile/app/controller/DocumentHolder', - 'presentationeditor/mobile/app/controller/DocumentPreview', - 'presentationeditor/mobile/app/controller/Settings', - 'presentationeditor/mobile/app/controller/edit/EditContainer', - 'presentationeditor/mobile/app/controller/edit/EditText', - 'presentationeditor/mobile/app/controller/edit/EditTable', - 'presentationeditor/mobile/app/controller/edit/EditImage', - 'presentationeditor/mobile/app/controller/edit/EditShape', - 'presentationeditor/mobile/app/controller/edit/EditSlide', - 'presentationeditor/mobile/app/controller/edit/EditChart', - 'presentationeditor/mobile/app/controller/edit/EditLink', - 'presentationeditor/mobile/app/controller/add/AddContainer', - 'presentationeditor/mobile/app/controller/add/AddTable', - 'presentationeditor/mobile/app/controller/add/AddShape', - 'presentationeditor/mobile/app/controller/add/AddImage', - 'presentationeditor/mobile/app/controller/add/AddLink', - 'presentationeditor/mobile/app/controller/add/AddSlide', - 'common/mobile/lib/controller/Collaboration' + Common.Locale.apply(function(){ + require([ + 'common/main/lib/util/LocalStorage', + 'common/main/lib/util/utils', + 'common/mobile/lib/controller/Plugins', + 'presentationeditor/mobile/app/controller/Editor', + 'presentationeditor/mobile/app/controller/Toolbar', + 'presentationeditor/mobile/app/controller/Search', + 'presentationeditor/mobile/app/controller/Main', + 'presentationeditor/mobile/app/controller/DocumentHolder', + 'presentationeditor/mobile/app/controller/DocumentPreview', + 'presentationeditor/mobile/app/controller/Settings', + 'presentationeditor/mobile/app/controller/edit/EditContainer', + 'presentationeditor/mobile/app/controller/edit/EditText', + 'presentationeditor/mobile/app/controller/edit/EditTable', + 'presentationeditor/mobile/app/controller/edit/EditImage', + 'presentationeditor/mobile/app/controller/edit/EditShape', + 'presentationeditor/mobile/app/controller/edit/EditSlide', + 'presentationeditor/mobile/app/controller/edit/EditChart', + 'presentationeditor/mobile/app/controller/edit/EditLink', + 'presentationeditor/mobile/app/controller/add/AddContainer', + 'presentationeditor/mobile/app/controller/add/AddTable', + 'presentationeditor/mobile/app/controller/add/AddShape', + 'presentationeditor/mobile/app/controller/add/AddImage', + 'presentationeditor/mobile/app/controller/add/AddLink', + 'presentationeditor/mobile/app/controller/add/AddSlide', + 'common/mobile/lib/controller/Collaboration' - ], function() { - window.compareVersions = true; - app.start(); + ], function() { + window.compareVersions = true; + app.start(); + }); }); }, function(err) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { diff --git a/apps/presentationeditor/mobile/app.js b/apps/presentationeditor/mobile/app.js index ec416bc5e9..abcec73a80 100644 --- a/apps/presentationeditor/mobile/app.js +++ b/apps/presentationeditor/mobile/app.js @@ -164,8 +164,6 @@ require([ ] }); - Common.Locale.apply(); - var device = Framework7.prototype.device; var loadPlatformCss = function (filename, opt){ var fileref = document.createElement('link'); @@ -204,34 +202,36 @@ require([ //Load platform styles loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css'); - require([ - 'common/main/lib/util/LocalStorage', - 'common/main/lib/util/utils', - 'common/mobile/lib/controller/Plugins', - 'presentationeditor/mobile/app/controller/Editor', - 'presentationeditor/mobile/app/controller/Toolbar', - 'presentationeditor/mobile/app/controller/Search', - 'presentationeditor/mobile/app/controller/Main', - 'presentationeditor/mobile/app/controller/DocumentHolder', - 'presentationeditor/mobile/app/controller/DocumentPreview', - 'presentationeditor/mobile/app/controller/Settings', - 'presentationeditor/mobile/app/controller/edit/EditContainer', - 'presentationeditor/mobile/app/controller/edit/EditText', - 'presentationeditor/mobile/app/controller/edit/EditTable', - 'presentationeditor/mobile/app/controller/edit/EditImage', - 'presentationeditor/mobile/app/controller/edit/EditShape', - 'presentationeditor/mobile/app/controller/edit/EditSlide', - 'presentationeditor/mobile/app/controller/edit/EditChart', - 'presentationeditor/mobile/app/controller/edit/EditLink', - 'presentationeditor/mobile/app/controller/add/AddContainer', - 'presentationeditor/mobile/app/controller/add/AddTable', - 'presentationeditor/mobile/app/controller/add/AddShape', - 'presentationeditor/mobile/app/controller/add/AddImage', - 'presentationeditor/mobile/app/controller/add/AddLink', - 'presentationeditor/mobile/app/controller/add/AddSlide', - 'common/mobile/lib/controller/Collaboration' - ], function() { - app.start(); + Common.Locale.apply(function(){ + require([ + 'common/main/lib/util/LocalStorage', + 'common/main/lib/util/utils', + 'common/mobile/lib/controller/Plugins', + 'presentationeditor/mobile/app/controller/Editor', + 'presentationeditor/mobile/app/controller/Toolbar', + 'presentationeditor/mobile/app/controller/Search', + 'presentationeditor/mobile/app/controller/Main', + 'presentationeditor/mobile/app/controller/DocumentHolder', + 'presentationeditor/mobile/app/controller/DocumentPreview', + 'presentationeditor/mobile/app/controller/Settings', + 'presentationeditor/mobile/app/controller/edit/EditContainer', + 'presentationeditor/mobile/app/controller/edit/EditText', + 'presentationeditor/mobile/app/controller/edit/EditTable', + 'presentationeditor/mobile/app/controller/edit/EditImage', + 'presentationeditor/mobile/app/controller/edit/EditShape', + 'presentationeditor/mobile/app/controller/edit/EditSlide', + 'presentationeditor/mobile/app/controller/edit/EditChart', + 'presentationeditor/mobile/app/controller/edit/EditLink', + 'presentationeditor/mobile/app/controller/add/AddContainer', + 'presentationeditor/mobile/app/controller/add/AddTable', + 'presentationeditor/mobile/app/controller/add/AddShape', + 'presentationeditor/mobile/app/controller/add/AddImage', + 'presentationeditor/mobile/app/controller/add/AddLink', + 'presentationeditor/mobile/app/controller/add/AddSlide', + 'common/mobile/lib/controller/Collaboration' + ], function() { + app.start(); + }); }); }, function(err) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { diff --git a/apps/spreadsheeteditor/main/app.js b/apps/spreadsheeteditor/main/app.js index f68d2b4f70..f274e5365a 100644 --- a/apps/spreadsheeteditor/main/app.js +++ b/apps/spreadsheeteditor/main/app.js @@ -167,42 +167,42 @@ require([ ] }); - Common.Locale.apply(); - - require([ - 'spreadsheeteditor/main/app/controller/Viewport', - 'spreadsheeteditor/main/app/controller/DocumentHolder', - 'spreadsheeteditor/main/app/controller/CellEditor', - 'spreadsheeteditor/main/app/controller/Toolbar', - 'spreadsheeteditor/main/app/controller/Statusbar', - 'spreadsheeteditor/main/app/controller/Spellcheck', - 'spreadsheeteditor/main/app/controller/RightMenu', - 'spreadsheeteditor/main/app/controller/LeftMenu', - 'spreadsheeteditor/main/app/controller/Main', - 'spreadsheeteditor/main/app/controller/Print', - 'spreadsheeteditor/main/app/controller/PivotTable', - 'spreadsheeteditor/main/app/controller/DataTab', - 'spreadsheeteditor/main/app/view/FileMenuPanels', - 'spreadsheeteditor/main/app/view/ParagraphSettings', - 'spreadsheeteditor/main/app/view/ImageSettings', - 'spreadsheeteditor/main/app/view/ChartSettings', - 'spreadsheeteditor/main/app/view/ShapeSettings', - 'spreadsheeteditor/main/app/view/TextArtSettings', - 'spreadsheeteditor/main/app/view/PivotSettings', - 'spreadsheeteditor/main/app/view/FieldSettingsDialog', - 'spreadsheeteditor/main/app/view/ValueFieldSettingsDialog', - 'spreadsheeteditor/main/app/view/SignatureSettings', - 'common/main/lib/util/utils', - 'common/main/lib/util/LocalStorage', - 'common/main/lib/controller/Fonts', - 'common/main/lib/controller/Comments', - 'common/main/lib/controller/Chat', - 'common/main/lib/controller/Plugins' - ,'common/main/lib/controller/ReviewChanges' - ,'common/main/lib/controller/Protection' - ,'common/main/lib/controller/Desktop' - ], function() { - app.start(); + Common.Locale.apply(function(){ + require([ + 'spreadsheeteditor/main/app/controller/Viewport', + 'spreadsheeteditor/main/app/controller/DocumentHolder', + 'spreadsheeteditor/main/app/controller/CellEditor', + 'spreadsheeteditor/main/app/controller/Toolbar', + 'spreadsheeteditor/main/app/controller/Statusbar', + 'spreadsheeteditor/main/app/controller/Spellcheck', + 'spreadsheeteditor/main/app/controller/RightMenu', + 'spreadsheeteditor/main/app/controller/LeftMenu', + 'spreadsheeteditor/main/app/controller/Main', + 'spreadsheeteditor/main/app/controller/Print', + 'spreadsheeteditor/main/app/controller/PivotTable', + 'spreadsheeteditor/main/app/controller/DataTab', + 'spreadsheeteditor/main/app/view/FileMenuPanels', + 'spreadsheeteditor/main/app/view/ParagraphSettings', + 'spreadsheeteditor/main/app/view/ImageSettings', + 'spreadsheeteditor/main/app/view/ChartSettings', + 'spreadsheeteditor/main/app/view/ShapeSettings', + 'spreadsheeteditor/main/app/view/TextArtSettings', + 'spreadsheeteditor/main/app/view/PivotSettings', + 'spreadsheeteditor/main/app/view/FieldSettingsDialog', + 'spreadsheeteditor/main/app/view/ValueFieldSettingsDialog', + 'spreadsheeteditor/main/app/view/SignatureSettings', + 'common/main/lib/util/utils', + 'common/main/lib/util/LocalStorage', + 'common/main/lib/controller/Fonts', + 'common/main/lib/controller/Comments', + 'common/main/lib/controller/Chat', + 'common/main/lib/controller/Plugins' + ,'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) { diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js index f2feab9a31..d3b10623ad 100644 --- a/apps/spreadsheeteditor/main/app_dev.js +++ b/apps/spreadsheeteditor/main/app_dev.js @@ -157,43 +157,43 @@ require([ ] }); - Common.Locale.apply(); - - require([ - 'spreadsheeteditor/main/app/controller/Viewport', - 'spreadsheeteditor/main/app/controller/DocumentHolder', - 'spreadsheeteditor/main/app/controller/CellEditor', - 'spreadsheeteditor/main/app/controller/Toolbar', - 'spreadsheeteditor/main/app/controller/Statusbar', - 'spreadsheeteditor/main/app/controller/Spellcheck', - 'spreadsheeteditor/main/app/controller/RightMenu', - 'spreadsheeteditor/main/app/controller/LeftMenu', - 'spreadsheeteditor/main/app/controller/Main', - 'spreadsheeteditor/main/app/controller/Print', - 'spreadsheeteditor/main/app/controller/PivotTable', - 'spreadsheeteditor/main/app/controller/DataTab', - 'spreadsheeteditor/main/app/view/FileMenuPanels', - 'spreadsheeteditor/main/app/view/ParagraphSettings', - 'spreadsheeteditor/main/app/view/ImageSettings', - 'spreadsheeteditor/main/app/view/ChartSettings', - 'spreadsheeteditor/main/app/view/ShapeSettings', - 'spreadsheeteditor/main/app/view/TextArtSettings', - 'spreadsheeteditor/main/app/view/PivotSettings', - 'spreadsheeteditor/main/app/view/FieldSettingsDialog', - 'spreadsheeteditor/main/app/view/ValueFieldSettingsDialog', - 'spreadsheeteditor/main/app/view/SignatureSettings', - 'common/main/lib/util/utils', - 'common/main/lib/util/LocalStorage', - 'common/main/lib/controller/Fonts', - 'common/main/lib/controller/Comments', - 'common/main/lib/controller/Chat', - 'common/main/lib/controller/Plugins' - ,'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([ + 'spreadsheeteditor/main/app/controller/Viewport', + 'spreadsheeteditor/main/app/controller/DocumentHolder', + 'spreadsheeteditor/main/app/controller/CellEditor', + 'spreadsheeteditor/main/app/controller/Toolbar', + 'spreadsheeteditor/main/app/controller/Statusbar', + 'spreadsheeteditor/main/app/controller/Spellcheck', + 'spreadsheeteditor/main/app/controller/RightMenu', + 'spreadsheeteditor/main/app/controller/LeftMenu', + 'spreadsheeteditor/main/app/controller/Main', + 'spreadsheeteditor/main/app/controller/Print', + 'spreadsheeteditor/main/app/controller/PivotTable', + 'spreadsheeteditor/main/app/controller/DataTab', + 'spreadsheeteditor/main/app/view/FileMenuPanels', + 'spreadsheeteditor/main/app/view/ParagraphSettings', + 'spreadsheeteditor/main/app/view/ImageSettings', + 'spreadsheeteditor/main/app/view/ChartSettings', + 'spreadsheeteditor/main/app/view/ShapeSettings', + 'spreadsheeteditor/main/app/view/TextArtSettings', + 'spreadsheeteditor/main/app/view/PivotSettings', + 'spreadsheeteditor/main/app/view/FieldSettingsDialog', + 'spreadsheeteditor/main/app/view/ValueFieldSettingsDialog', + 'spreadsheeteditor/main/app/view/SignatureSettings', + 'common/main/lib/util/utils', + 'common/main/lib/util/LocalStorage', + 'common/main/lib/controller/Fonts', + 'common/main/lib/controller/Comments', + 'common/main/lib/controller/Chat', + 'common/main/lib/controller/Plugins' + ,'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) { diff --git a/apps/spreadsheeteditor/mobile/app-dev.js b/apps/spreadsheeteditor/mobile/app-dev.js index 1a92b9ba28..b19dcb0bf1 100644 --- a/apps/spreadsheeteditor/mobile/app-dev.js +++ b/apps/spreadsheeteditor/mobile/app-dev.js @@ -139,8 +139,6 @@ require([ ] }); - Common.Locale.apply(); - var device = Framework7.prototype.device; var loadPlatformCss = function (filename, opt){ var fileref = document.createElement('link'); @@ -182,36 +180,38 @@ require([ //Load platform styles loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css'); - require([ - 'common/main/lib/util/LocalStorage', - 'common/main/lib/util/utils', - 'common/mobile/lib/controller/Plugins', - 'spreadsheeteditor/mobile/app/controller/Editor', - 'spreadsheeteditor/mobile/app/controller/Toolbar', - 'spreadsheeteditor/mobile/app/controller/Search', - 'spreadsheeteditor/mobile/app/controller/Main', - 'spreadsheeteditor/mobile/app/controller/DocumentHolder' - ,'spreadsheeteditor/mobile/app/controller/CellEditor' - ,'spreadsheeteditor/mobile/app/controller/Statusbar' - ,'spreadsheeteditor/mobile/app/controller/Settings' - ,'spreadsheeteditor/mobile/app/controller/edit/EditContainer' - ,'spreadsheeteditor/mobile/app/controller/edit/EditCell' - ,'spreadsheeteditor/mobile/app/controller/edit/EditText' - ,'spreadsheeteditor/mobile/app/controller/edit/EditImage' - ,'spreadsheeteditor/mobile/app/controller/edit/EditShape' - ,'spreadsheeteditor/mobile/app/controller/edit/EditChart' - ,'spreadsheeteditor/mobile/app/controller/edit/EditHyperlink' - ,'spreadsheeteditor/mobile/app/controller/add/AddContainer' - ,'spreadsheeteditor/mobile/app/controller/add/AddChart' - ,'spreadsheeteditor/mobile/app/controller/add/AddFunction' - ,'spreadsheeteditor/mobile/app/controller/add/AddShape' - ,'spreadsheeteditor/mobile/app/controller/add/AddOther' - ,'spreadsheeteditor/mobile/app/controller/add/AddLink' - ,'spreadsheeteditor/mobile/app/controller/FilterOptions' - ,'common/mobile/lib/controller/Collaboration' - ], function() { - window.compareVersions = true; - app.start(); + Common.Locale.apply(function(){ + require([ + 'common/main/lib/util/LocalStorage', + 'common/main/lib/util/utils', + 'common/mobile/lib/controller/Plugins', + 'spreadsheeteditor/mobile/app/controller/Editor', + 'spreadsheeteditor/mobile/app/controller/Toolbar', + 'spreadsheeteditor/mobile/app/controller/Search', + 'spreadsheeteditor/mobile/app/controller/Main', + 'spreadsheeteditor/mobile/app/controller/DocumentHolder' + ,'spreadsheeteditor/mobile/app/controller/CellEditor' + ,'spreadsheeteditor/mobile/app/controller/Statusbar' + ,'spreadsheeteditor/mobile/app/controller/Settings' + ,'spreadsheeteditor/mobile/app/controller/edit/EditContainer' + ,'spreadsheeteditor/mobile/app/controller/edit/EditCell' + ,'spreadsheeteditor/mobile/app/controller/edit/EditText' + ,'spreadsheeteditor/mobile/app/controller/edit/EditImage' + ,'spreadsheeteditor/mobile/app/controller/edit/EditShape' + ,'spreadsheeteditor/mobile/app/controller/edit/EditChart' + ,'spreadsheeteditor/mobile/app/controller/edit/EditHyperlink' + ,'spreadsheeteditor/mobile/app/controller/add/AddContainer' + ,'spreadsheeteditor/mobile/app/controller/add/AddChart' + ,'spreadsheeteditor/mobile/app/controller/add/AddFunction' + ,'spreadsheeteditor/mobile/app/controller/add/AddShape' + ,'spreadsheeteditor/mobile/app/controller/add/AddOther' + ,'spreadsheeteditor/mobile/app/controller/add/AddLink' + ,'spreadsheeteditor/mobile/app/controller/FilterOptions' + ,'common/mobile/lib/controller/Collaboration' + ], function() { + window.compareVersions = true; + app.start(); + }); }); }, function(err) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { diff --git a/apps/spreadsheeteditor/mobile/app.js b/apps/spreadsheeteditor/mobile/app.js index 582f07fd78..9536367dd0 100644 --- a/apps/spreadsheeteditor/mobile/app.js +++ b/apps/spreadsheeteditor/mobile/app.js @@ -150,8 +150,6 @@ require([ ] }); - Common.Locale.apply(); - var device = Framework7.prototype.device; var loadPlatformCss = function (filename, opt){ var fileref = document.createElement('link'); @@ -193,35 +191,37 @@ require([ //Load platform styles loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css'); - require([ - 'common/main/lib/util/LocalStorage', - 'common/main/lib/util/utils', - 'common/mobile/lib/controller/Plugins', - 'spreadsheeteditor/mobile/app/controller/Editor', - 'spreadsheeteditor/mobile/app/controller/Toolbar', - 'spreadsheeteditor/mobile/app/controller/Search', - 'spreadsheeteditor/mobile/app/controller/Main', - 'spreadsheeteditor/mobile/app/controller/DocumentHolder' - ,'spreadsheeteditor/mobile/app/controller/CellEditor' - ,'spreadsheeteditor/mobile/app/controller/Statusbar' - ,'spreadsheeteditor/mobile/app/controller/Settings' - ,'spreadsheeteditor/mobile/app/controller/edit/EditContainer' - ,'spreadsheeteditor/mobile/app/controller/edit/EditCell' - ,'spreadsheeteditor/mobile/app/controller/edit/EditText' - ,'spreadsheeteditor/mobile/app/controller/edit/EditImage' - ,'spreadsheeteditor/mobile/app/controller/edit/EditShape' - ,'spreadsheeteditor/mobile/app/controller/edit/EditChart' - ,'spreadsheeteditor/mobile/app/controller/edit/EditHyperlink' - ,'spreadsheeteditor/mobile/app/controller/add/AddContainer' - ,'spreadsheeteditor/mobile/app/controller/add/AddChart' - ,'spreadsheeteditor/mobile/app/controller/add/AddFunction' - ,'spreadsheeteditor/mobile/app/controller/add/AddShape' - ,'spreadsheeteditor/mobile/app/controller/add/AddOther' - ,'spreadsheeteditor/mobile/app/controller/add/AddLink' - ,'spreadsheeteditor/mobile/app/controller/FilterOptions' - ,'common/mobile/lib/controller/Collaboration' - ], function() { - app.start(); + Common.Locale.apply(function(){ + require([ + 'common/main/lib/util/LocalStorage', + 'common/main/lib/util/utils', + 'common/mobile/lib/controller/Plugins', + 'spreadsheeteditor/mobile/app/controller/Editor', + 'spreadsheeteditor/mobile/app/controller/Toolbar', + 'spreadsheeteditor/mobile/app/controller/Search', + 'spreadsheeteditor/mobile/app/controller/Main', + 'spreadsheeteditor/mobile/app/controller/DocumentHolder' + ,'spreadsheeteditor/mobile/app/controller/CellEditor' + ,'spreadsheeteditor/mobile/app/controller/Statusbar' + ,'spreadsheeteditor/mobile/app/controller/Settings' + ,'spreadsheeteditor/mobile/app/controller/edit/EditContainer' + ,'spreadsheeteditor/mobile/app/controller/edit/EditCell' + ,'spreadsheeteditor/mobile/app/controller/edit/EditText' + ,'spreadsheeteditor/mobile/app/controller/edit/EditImage' + ,'spreadsheeteditor/mobile/app/controller/edit/EditShape' + ,'spreadsheeteditor/mobile/app/controller/edit/EditChart' + ,'spreadsheeteditor/mobile/app/controller/edit/EditHyperlink' + ,'spreadsheeteditor/mobile/app/controller/add/AddContainer' + ,'spreadsheeteditor/mobile/app/controller/add/AddChart' + ,'spreadsheeteditor/mobile/app/controller/add/AddFunction' + ,'spreadsheeteditor/mobile/app/controller/add/AddShape' + ,'spreadsheeteditor/mobile/app/controller/add/AddOther' + ,'spreadsheeteditor/mobile/app/controller/add/AddLink' + ,'spreadsheeteditor/mobile/app/controller/FilterOptions' + ,'common/mobile/lib/controller/Collaboration' + ], function() { + app.start(); + }); }); }, function(err) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {