Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[PE][SSE][Mobile] Fix loading translations on IE and minimized version

Browse source
This commit is contained in:
Julia Radzhabova 2019-09-18 13:53:29 +03:00
parent 6061d0f2d1
commit fe2d9f5154
10 changed files with 323 additions and 323 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
apps/documenteditor/mobile/app-dev.js
View file

@ -155,8 +155,6 @@ require([
] ]
}); });
Common.Locale.apply();
var device = Framework7.prototype.device; var device = Framework7.prototype.device;
var loadPlatformCss = function (filename, opt){ var loadPlatformCss = function (filename, opt){
var fileref = document.createElement('link'); var fileref = document.createElement('link');
@ -198,34 +196,36 @@ require([
//Load platform styles //Load platform styles
loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css'); loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css');
require([ Common.Locale.apply(function() {
'common/main/lib/util/LocalStorage', require([
'common/main/lib/util/utils', 'common/main/lib/util/LocalStorage',
'common/mobile/lib/controller/Plugins', 'common/main/lib/util/utils',
'documenteditor/mobile/app/controller/Editor', 'common/mobile/lib/controller/Plugins',
'documenteditor/mobile/app/controller/Toolbar', 'documenteditor/mobile/app/controller/Editor',
'documenteditor/mobile/app/controller/Search', 'documenteditor/mobile/app/controller/Toolbar',
'documenteditor/mobile/app/controller/Main', 'documenteditor/mobile/app/controller/Search',
'documenteditor/mobile/app/controller/DocumentHolder', 'documenteditor/mobile/app/controller/Main',
'documenteditor/mobile/app/controller/Settings', 'documenteditor/mobile/app/controller/DocumentHolder',
'documenteditor/mobile/app/controller/edit/EditContainer', 'documenteditor/mobile/app/controller/Settings',
'documenteditor/mobile/app/controller/edit/EditText', 'documenteditor/mobile/app/controller/edit/EditContainer',
'documenteditor/mobile/app/controller/edit/EditParagraph', 'documenteditor/mobile/app/controller/edit/EditText',
'documenteditor/mobile/app/controller/edit/EditHeader', 'documenteditor/mobile/app/controller/edit/EditParagraph',
'documenteditor/mobile/app/controller/edit/EditTable', 'documenteditor/mobile/app/controller/edit/EditHeader',
'documenteditor/mobile/app/controller/edit/EditImage', 'documenteditor/mobile/app/controller/edit/EditTable',
'documenteditor/mobile/app/controller/edit/EditShape', 'documenteditor/mobile/app/controller/edit/EditImage',
'documenteditor/mobile/app/controller/edit/EditChart', 'documenteditor/mobile/app/controller/edit/EditShape',
'documenteditor/mobile/app/controller/edit/EditHyperlink', 'documenteditor/mobile/app/controller/edit/EditChart',
'documenteditor/mobile/app/controller/add/AddContainer', 'documenteditor/mobile/app/controller/edit/EditHyperlink',
'documenteditor/mobile/app/controller/add/AddTable', 'documenteditor/mobile/app/controller/add/AddContainer',
'documenteditor/mobile/app/controller/add/AddShape', 'documenteditor/mobile/app/controller/add/AddTable',
'documenteditor/mobile/app/controller/add/AddImage', 'documenteditor/mobile/app/controller/add/AddShape',
'documenteditor/mobile/app/controller/add/AddOther', 'documenteditor/mobile/app/controller/add/AddImage',
'common/mobile/lib/controller/Collaboration' 'documenteditor/mobile/app/controller/add/AddOther',
], function() { 'common/mobile/lib/controller/Collaboration'
window.compareVersions = true; ], function() {
app.start(); window.compareVersions = true;
app.start();
});
}); });
}, function(err) { }, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {

58
apps/documenteditor/mobile/app.js
View file

@ -166,8 +166,6 @@ require([
] ]
}); });
Common.Locale.apply();
var device = Framework7.prototype.device; var device = Framework7.prototype.device;
var loadPlatformCss = function (filename, opt){ var loadPlatformCss = function (filename, opt){
var fileref = document.createElement('link'); var fileref = document.createElement('link');
@ -209,33 +207,35 @@ require([
//Load platform styles //Load platform styles
loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css'); loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css');
require([ Common.Locale.apply(function() {
'common/main/lib/util/LocalStorage', require([
'common/main/lib/util/utils', 'common/main/lib/util/LocalStorage',
'common/mobile/lib/controller/Plugins', 'common/main/lib/util/utils',
'documenteditor/mobile/app/controller/Editor', 'common/mobile/lib/controller/Plugins',
'documenteditor/mobile/app/controller/Toolbar', 'documenteditor/mobile/app/controller/Editor',
'documenteditor/mobile/app/controller/Search', 'documenteditor/mobile/app/controller/Toolbar',
'documenteditor/mobile/app/controller/Main', 'documenteditor/mobile/app/controller/Search',
'documenteditor/mobile/app/controller/DocumentHolder', 'documenteditor/mobile/app/controller/Main',
'documenteditor/mobile/app/controller/Settings', 'documenteditor/mobile/app/controller/DocumentHolder',
'documenteditor/mobile/app/controller/edit/EditContainer', 'documenteditor/mobile/app/controller/Settings',
'documenteditor/mobile/app/controller/edit/EditText', 'documenteditor/mobile/app/controller/edit/EditContainer',
'documenteditor/mobile/app/controller/edit/EditParagraph', 'documenteditor/mobile/app/controller/edit/EditText',
'documenteditor/mobile/app/controller/edit/EditHeader', 'documenteditor/mobile/app/controller/edit/EditParagraph',
'documenteditor/mobile/app/controller/edit/EditTable', 'documenteditor/mobile/app/controller/edit/EditHeader',
'documenteditor/mobile/app/controller/edit/EditImage', 'documenteditor/mobile/app/controller/edit/EditTable',
'documenteditor/mobile/app/controller/edit/EditShape', 'documenteditor/mobile/app/controller/edit/EditImage',
'documenteditor/mobile/app/controller/edit/EditChart', 'documenteditor/mobile/app/controller/edit/EditShape',
'documenteditor/mobile/app/controller/edit/EditHyperlink', 'documenteditor/mobile/app/controller/edit/EditChart',
'documenteditor/mobile/app/controller/add/AddContainer', 'documenteditor/mobile/app/controller/edit/EditHyperlink',
'documenteditor/mobile/app/controller/add/AddTable', 'documenteditor/mobile/app/controller/add/AddContainer',
'documenteditor/mobile/app/controller/add/AddShape', 'documenteditor/mobile/app/controller/add/AddTable',
'documenteditor/mobile/app/controller/add/AddImage', 'documenteditor/mobile/app/controller/add/AddShape',
'documenteditor/mobile/app/controller/add/AddOther', 'documenteditor/mobile/app/controller/add/AddImage',
'common/mobile/lib/controller/Collaboration' 'documenteditor/mobile/app/controller/add/AddOther',
], function() { 'common/mobile/lib/controller/Collaboration'
app.start(); ], function() {
app.start();
});
}); });
}, function(err) { }, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {

66
apps/presentationeditor/main/app.js
View file

@ -160,39 +160,39 @@ require([
] ]
}); });
Common.Locale.apply(); Common.Locale.apply(function(){
require([
require([ 'presentationeditor/main/app/controller/Viewport',
'presentationeditor/main/app/controller/Viewport', 'presentationeditor/main/app/controller/DocumentHolder',
'presentationeditor/main/app/controller/DocumentHolder', 'presentationeditor/main/app/controller/Toolbar',
'presentationeditor/main/app/controller/Toolbar', 'presentationeditor/main/app/controller/Statusbar',
'presentationeditor/main/app/controller/Statusbar', '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/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', 'presentationeditor/main/app/view/SlideSettings',
'presentationeditor/main/app/view/SlideSettings', 'presentationeditor/main/app/view/TableSettings',
'presentationeditor/main/app/view/TableSettings', 'presentationeditor/main/app/view/TextArtSettings',
'presentationeditor/main/app/view/TextArtSettings', 'presentationeditor/main/app/view/SignatureSettings',
'presentationeditor/main/app/view/SignatureSettings', 'common/main/lib/util/utils',
'common/main/lib/util/utils', 'common/main/lib/util/LocalStorage',
'common/main/lib/util/LocalStorage', 'common/main/lib/controller/Fonts'
'common/main/lib/controller/Fonts' /** coauthoring begin **/
/** coauthoring begin **/ ,'common/main/lib/controller/Comments',
,'common/main/lib/controller/Comments', 'common/main/lib/controller/Chat',
'common/main/lib/controller/Chat', /** coauthoring end **/
/** coauthoring end **/ 'common/main/lib/controller/Plugins',
'common/main/lib/controller/Plugins', 'presentationeditor/main/app/view/ChartSettings',
'presentationeditor/main/app/view/ChartSettings', 'common/main/lib/controller/ExternalDiagramEditor'
'common/main/lib/controller/ExternalDiagramEditor' ,'common/main/lib/controller/ReviewChanges'
,'common/main/lib/controller/ReviewChanges' ,'common/main/lib/controller/Protection'
,'common/main/lib/controller/Protection' ,'common/main/lib/controller/Desktop'
,'common/main/lib/controller/Desktop' ], function() {
], function() { app.start();
app.start(); });
}); });
}, function(err) { }, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {

68
apps/presentationeditor/main/app_dev.js
View file

@ -151,40 +151,40 @@ require([
] ]
}); });
Common.Locale.apply(); Common.Locale.apply(function(){
require([
require([ 'presentationeditor/main/app/controller/Viewport',
'presentationeditor/main/app/controller/Viewport', 'presentationeditor/main/app/controller/DocumentHolder',
'presentationeditor/main/app/controller/DocumentHolder', 'presentationeditor/main/app/controller/Toolbar',
'presentationeditor/main/app/controller/Toolbar', 'presentationeditor/main/app/controller/Statusbar',
'presentationeditor/main/app/controller/Statusbar', '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/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', 'presentationeditor/main/app/view/SlideSettings',
'presentationeditor/main/app/view/SlideSettings', 'presentationeditor/main/app/view/TableSettings',
'presentationeditor/main/app/view/TableSettings', 'presentationeditor/main/app/view/TextArtSettings',
'presentationeditor/main/app/view/TextArtSettings', 'presentationeditor/main/app/view/SignatureSettings',
'presentationeditor/main/app/view/SignatureSettings', 'common/main/lib/util/utils',
'common/main/lib/util/utils', 'common/main/lib/util/LocalStorage',
'common/main/lib/util/LocalStorage', 'common/main/lib/controller/Fonts'
'common/main/lib/controller/Fonts' /** coauthoring begin **/
/** coauthoring begin **/ ,'common/main/lib/controller/Comments',
,'common/main/lib/controller/Comments', 'common/main/lib/controller/Chat',
'common/main/lib/controller/Chat', /** coauthoring end **/
/** coauthoring end **/ 'common/main/lib/controller/Plugins',
'common/main/lib/controller/Plugins', 'presentationeditor/main/app/view/ChartSettings',
'presentationeditor/main/app/view/ChartSettings', 'common/main/lib/controller/ExternalDiagramEditor'
'common/main/lib/controller/ExternalDiagramEditor' ,'common/main/lib/controller/ReviewChanges'
,'common/main/lib/controller/ReviewChanges' ,'common/main/lib/controller/Protection'
,'common/main/lib/controller/Protection' ,'common/main/lib/controller/Desktop'
,'common/main/lib/controller/Desktop' ], function() {
], function() { window.compareVersions = true;
window.compareVersions = true; app.start();
app.start(); });
}); });
}, function(err) { }, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {

62
apps/presentationeditor/mobile/app-dev.js
View file

@ -153,8 +153,6 @@ require([
] ]
}); });
Common.Locale.apply();
var device = Framework7.prototype.device; var device = Framework7.prototype.device;
var loadPlatformCss = function (filename, opt){ var loadPlatformCss = function (filename, opt){
var fileref = document.createElement('link'); var fileref = document.createElement('link');
@ -193,36 +191,38 @@ require([
//Load platform styles //Load platform styles
loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css'); loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css');
require([ Common.Locale.apply(function(){
'common/main/lib/util/LocalStorage', require([
'common/main/lib/util/utils', 'common/main/lib/util/LocalStorage',
'common/mobile/lib/controller/Plugins', 'common/main/lib/util/utils',
'presentationeditor/mobile/app/controller/Editor', 'common/mobile/lib/controller/Plugins',
'presentationeditor/mobile/app/controller/Toolbar', 'presentationeditor/mobile/app/controller/Editor',
'presentationeditor/mobile/app/controller/Search', 'presentationeditor/mobile/app/controller/Toolbar',
'presentationeditor/mobile/app/controller/Main', 'presentationeditor/mobile/app/controller/Search',
'presentationeditor/mobile/app/controller/DocumentHolder', 'presentationeditor/mobile/app/controller/Main',
'presentationeditor/mobile/app/controller/DocumentPreview', 'presentationeditor/mobile/app/controller/DocumentHolder',
'presentationeditor/mobile/app/controller/Settings', 'presentationeditor/mobile/app/controller/DocumentPreview',
'presentationeditor/mobile/app/controller/edit/EditContainer', 'presentationeditor/mobile/app/controller/Settings',
'presentationeditor/mobile/app/controller/edit/EditText', 'presentationeditor/mobile/app/controller/edit/EditContainer',
'presentationeditor/mobile/app/controller/edit/EditTable', 'presentationeditor/mobile/app/controller/edit/EditText',
'presentationeditor/mobile/app/controller/edit/EditImage', 'presentationeditor/mobile/app/controller/edit/EditTable',
'presentationeditor/mobile/app/controller/edit/EditShape', 'presentationeditor/mobile/app/controller/edit/EditImage',
'presentationeditor/mobile/app/controller/edit/EditSlide', 'presentationeditor/mobile/app/controller/edit/EditShape',
'presentationeditor/mobile/app/controller/edit/EditChart', 'presentationeditor/mobile/app/controller/edit/EditSlide',
'presentationeditor/mobile/app/controller/edit/EditLink', 'presentationeditor/mobile/app/controller/edit/EditChart',
'presentationeditor/mobile/app/controller/add/AddContainer', 'presentationeditor/mobile/app/controller/edit/EditLink',
'presentationeditor/mobile/app/controller/add/AddTable', 'presentationeditor/mobile/app/controller/add/AddContainer',
'presentationeditor/mobile/app/controller/add/AddShape', 'presentationeditor/mobile/app/controller/add/AddTable',
'presentationeditor/mobile/app/controller/add/AddImage', 'presentationeditor/mobile/app/controller/add/AddShape',
'presentationeditor/mobile/app/controller/add/AddLink', 'presentationeditor/mobile/app/controller/add/AddImage',
'presentationeditor/mobile/app/controller/add/AddSlide', 'presentationeditor/mobile/app/controller/add/AddLink',
'common/mobile/lib/controller/Collaboration' 'presentationeditor/mobile/app/controller/add/AddSlide',
'common/mobile/lib/controller/Collaboration'
], function() { ], function() {
window.compareVersions = true; window.compareVersions = true;
app.start(); app.start();
});
}); });
}, function(err) { }, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {

60
apps/presentationeditor/mobile/app.js
View file

@ -164,8 +164,6 @@ require([
] ]
}); });
Common.Locale.apply();
var device = Framework7.prototype.device; var device = Framework7.prototype.device;
var loadPlatformCss = function (filename, opt){ var loadPlatformCss = function (filename, opt){
var fileref = document.createElement('link'); var fileref = document.createElement('link');
@ -204,34 +202,36 @@ require([
//Load platform styles //Load platform styles
loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css'); loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css');
require([ Common.Locale.apply(function(){
'common/main/lib/util/LocalStorage', require([
'common/main/lib/util/utils', 'common/main/lib/util/LocalStorage',
'common/mobile/lib/controller/Plugins', 'common/main/lib/util/utils',
'presentationeditor/mobile/app/controller/Editor', 'common/mobile/lib/controller/Plugins',
'presentationeditor/mobile/app/controller/Toolbar', 'presentationeditor/mobile/app/controller/Editor',
'presentationeditor/mobile/app/controller/Search', 'presentationeditor/mobile/app/controller/Toolbar',
'presentationeditor/mobile/app/controller/Main', 'presentationeditor/mobile/app/controller/Search',
'presentationeditor/mobile/app/controller/DocumentHolder', 'presentationeditor/mobile/app/controller/Main',
'presentationeditor/mobile/app/controller/DocumentPreview', 'presentationeditor/mobile/app/controller/DocumentHolder',
'presentationeditor/mobile/app/controller/Settings', 'presentationeditor/mobile/app/controller/DocumentPreview',
'presentationeditor/mobile/app/controller/edit/EditContainer', 'presentationeditor/mobile/app/controller/Settings',
'presentationeditor/mobile/app/controller/edit/EditText', 'presentationeditor/mobile/app/controller/edit/EditContainer',
'presentationeditor/mobile/app/controller/edit/EditTable', 'presentationeditor/mobile/app/controller/edit/EditText',
'presentationeditor/mobile/app/controller/edit/EditImage', 'presentationeditor/mobile/app/controller/edit/EditTable',
'presentationeditor/mobile/app/controller/edit/EditShape', 'presentationeditor/mobile/app/controller/edit/EditImage',
'presentationeditor/mobile/app/controller/edit/EditSlide', 'presentationeditor/mobile/app/controller/edit/EditShape',
'presentationeditor/mobile/app/controller/edit/EditChart', 'presentationeditor/mobile/app/controller/edit/EditSlide',
'presentationeditor/mobile/app/controller/edit/EditLink', 'presentationeditor/mobile/app/controller/edit/EditChart',
'presentationeditor/mobile/app/controller/add/AddContainer', 'presentationeditor/mobile/app/controller/edit/EditLink',
'presentationeditor/mobile/app/controller/add/AddTable', 'presentationeditor/mobile/app/controller/add/AddContainer',
'presentationeditor/mobile/app/controller/add/AddShape', 'presentationeditor/mobile/app/controller/add/AddTable',
'presentationeditor/mobile/app/controller/add/AddImage', 'presentationeditor/mobile/app/controller/add/AddShape',
'presentationeditor/mobile/app/controller/add/AddLink', 'presentationeditor/mobile/app/controller/add/AddImage',
'presentationeditor/mobile/app/controller/add/AddSlide', 'presentationeditor/mobile/app/controller/add/AddLink',
'common/mobile/lib/controller/Collaboration' 'presentationeditor/mobile/app/controller/add/AddSlide',
], function() { 'common/mobile/lib/controller/Collaboration'
app.start(); ], function() {
app.start();
});
}); });
}, function(err) { }, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {

72
apps/spreadsheeteditor/main/app.js
View file

@ -167,42 +167,42 @@ require([
] ]
}); });
Common.Locale.apply(); Common.Locale.apply(function(){
require([
require([ 'spreadsheeteditor/main/app/controller/Viewport',
'spreadsheeteditor/main/app/controller/Viewport', 'spreadsheeteditor/main/app/controller/DocumentHolder',
'spreadsheeteditor/main/app/controller/DocumentHolder', 'spreadsheeteditor/main/app/controller/CellEditor',
'spreadsheeteditor/main/app/controller/CellEditor', 'spreadsheeteditor/main/app/controller/Toolbar',
'spreadsheeteditor/main/app/controller/Toolbar', 'spreadsheeteditor/main/app/controller/Statusbar',
'spreadsheeteditor/main/app/controller/Statusbar', 'spreadsheeteditor/main/app/controller/Spellcheck',
'spreadsheeteditor/main/app/controller/Spellcheck', 'spreadsheeteditor/main/app/controller/RightMenu',
'spreadsheeteditor/main/app/controller/RightMenu', '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/controller/PivotTable',
'spreadsheeteditor/main/app/controller/PivotTable', 'spreadsheeteditor/main/app/controller/DataTab',
'spreadsheeteditor/main/app/controller/DataTab', 'spreadsheeteditor/main/app/view/FileMenuPanels',
'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', 'spreadsheeteditor/main/app/view/ShapeSettings',
'spreadsheeteditor/main/app/view/ShapeSettings', 'spreadsheeteditor/main/app/view/TextArtSettings',
'spreadsheeteditor/main/app/view/TextArtSettings', 'spreadsheeteditor/main/app/view/PivotSettings',
'spreadsheeteditor/main/app/view/PivotSettings', 'spreadsheeteditor/main/app/view/FieldSettingsDialog',
'spreadsheeteditor/main/app/view/FieldSettingsDialog', 'spreadsheeteditor/main/app/view/ValueFieldSettingsDialog',
'spreadsheeteditor/main/app/view/ValueFieldSettingsDialog', 'spreadsheeteditor/main/app/view/SignatureSettings',
'spreadsheeteditor/main/app/view/SignatureSettings', 'common/main/lib/util/utils',
'common/main/lib/util/utils', 'common/main/lib/util/LocalStorage',
'common/main/lib/util/LocalStorage', 'common/main/lib/controller/Fonts',
'common/main/lib/controller/Fonts', 'common/main/lib/controller/Comments',
'common/main/lib/controller/Comments', 'common/main/lib/controller/Chat',
'common/main/lib/controller/Chat', 'common/main/lib/controller/Plugins'
'common/main/lib/controller/Plugins' ,'common/main/lib/controller/ReviewChanges'
,'common/main/lib/controller/ReviewChanges' ,'common/main/lib/controller/Protection'
,'common/main/lib/controller/Protection' ,'common/main/lib/controller/Desktop'
,'common/main/lib/controller/Desktop' ], function() {
], function() { app.start();
app.start(); });
}); });
}, function(err) { }, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {

74
apps/spreadsheeteditor/main/app_dev.js
View file

@ -157,43 +157,43 @@ require([
] ]
}); });
Common.Locale.apply(); Common.Locale.apply(function(){
require([
require([ 'spreadsheeteditor/main/app/controller/Viewport',
'spreadsheeteditor/main/app/controller/Viewport', 'spreadsheeteditor/main/app/controller/DocumentHolder',
'spreadsheeteditor/main/app/controller/DocumentHolder', 'spreadsheeteditor/main/app/controller/CellEditor',
'spreadsheeteditor/main/app/controller/CellEditor', 'spreadsheeteditor/main/app/controller/Toolbar',
'spreadsheeteditor/main/app/controller/Toolbar', 'spreadsheeteditor/main/app/controller/Statusbar',
'spreadsheeteditor/main/app/controller/Statusbar', 'spreadsheeteditor/main/app/controller/Spellcheck',
'spreadsheeteditor/main/app/controller/Spellcheck', 'spreadsheeteditor/main/app/controller/RightMenu',
'spreadsheeteditor/main/app/controller/RightMenu', '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/controller/PivotTable',
'spreadsheeteditor/main/app/controller/PivotTable', 'spreadsheeteditor/main/app/controller/DataTab',
'spreadsheeteditor/main/app/controller/DataTab', 'spreadsheeteditor/main/app/view/FileMenuPanels',
'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', 'spreadsheeteditor/main/app/view/ShapeSettings',
'spreadsheeteditor/main/app/view/ShapeSettings', 'spreadsheeteditor/main/app/view/TextArtSettings',
'spreadsheeteditor/main/app/view/TextArtSettings', 'spreadsheeteditor/main/app/view/PivotSettings',
'spreadsheeteditor/main/app/view/PivotSettings', 'spreadsheeteditor/main/app/view/FieldSettingsDialog',
'spreadsheeteditor/main/app/view/FieldSettingsDialog', 'spreadsheeteditor/main/app/view/ValueFieldSettingsDialog',
'spreadsheeteditor/main/app/view/ValueFieldSettingsDialog', 'spreadsheeteditor/main/app/view/SignatureSettings',
'spreadsheeteditor/main/app/view/SignatureSettings', 'common/main/lib/util/utils',
'common/main/lib/util/utils', 'common/main/lib/util/LocalStorage',
'common/main/lib/util/LocalStorage', 'common/main/lib/controller/Fonts',
'common/main/lib/controller/Fonts', 'common/main/lib/controller/Comments',
'common/main/lib/controller/Comments', 'common/main/lib/controller/Chat',
'common/main/lib/controller/Chat', 'common/main/lib/controller/Plugins'
'common/main/lib/controller/Plugins' ,'common/main/lib/controller/ReviewChanges'
,'common/main/lib/controller/ReviewChanges' ,'common/main/lib/controller/Protection'
,'common/main/lib/controller/Protection' ,'common/main/lib/controller/Desktop'
,'common/main/lib/controller/Desktop' ], function() {
], function() { window.compareVersions = true;
window.compareVersions = true; app.start();
app.start(); });
}); });
}, function(err) { }, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {

64
apps/spreadsheeteditor/mobile/app-dev.js
View file

@ -139,8 +139,6 @@ require([
] ]
}); });
Common.Locale.apply();
var device = Framework7.prototype.device; var device = Framework7.prototype.device;
var loadPlatformCss = function (filename, opt){ var loadPlatformCss = function (filename, opt){
var fileref = document.createElement('link'); var fileref = document.createElement('link');
@ -182,36 +180,38 @@ require([
//Load platform styles //Load platform styles
loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css'); loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css');
require([ Common.Locale.apply(function(){
'common/main/lib/util/LocalStorage', require([
'common/main/lib/util/utils', 'common/main/lib/util/LocalStorage',
'common/mobile/lib/controller/Plugins', 'common/main/lib/util/utils',
'spreadsheeteditor/mobile/app/controller/Editor', 'common/mobile/lib/controller/Plugins',
'spreadsheeteditor/mobile/app/controller/Toolbar', 'spreadsheeteditor/mobile/app/controller/Editor',
'spreadsheeteditor/mobile/app/controller/Search', 'spreadsheeteditor/mobile/app/controller/Toolbar',
'spreadsheeteditor/mobile/app/controller/Main', 'spreadsheeteditor/mobile/app/controller/Search',
'spreadsheeteditor/mobile/app/controller/DocumentHolder' 'spreadsheeteditor/mobile/app/controller/Main',
,'spreadsheeteditor/mobile/app/controller/CellEditor' 'spreadsheeteditor/mobile/app/controller/DocumentHolder'
,'spreadsheeteditor/mobile/app/controller/Statusbar' ,'spreadsheeteditor/mobile/app/controller/CellEditor'
,'spreadsheeteditor/mobile/app/controller/Settings' ,'spreadsheeteditor/mobile/app/controller/Statusbar'
,'spreadsheeteditor/mobile/app/controller/edit/EditContainer' ,'spreadsheeteditor/mobile/app/controller/Settings'
,'spreadsheeteditor/mobile/app/controller/edit/EditCell' ,'spreadsheeteditor/mobile/app/controller/edit/EditContainer'
,'spreadsheeteditor/mobile/app/controller/edit/EditText' ,'spreadsheeteditor/mobile/app/controller/edit/EditCell'
,'spreadsheeteditor/mobile/app/controller/edit/EditImage' ,'spreadsheeteditor/mobile/app/controller/edit/EditText'
,'spreadsheeteditor/mobile/app/controller/edit/EditShape' ,'spreadsheeteditor/mobile/app/controller/edit/EditImage'
,'spreadsheeteditor/mobile/app/controller/edit/EditChart' ,'spreadsheeteditor/mobile/app/controller/edit/EditShape'
,'spreadsheeteditor/mobile/app/controller/edit/EditHyperlink' ,'spreadsheeteditor/mobile/app/controller/edit/EditChart'
,'spreadsheeteditor/mobile/app/controller/add/AddContainer' ,'spreadsheeteditor/mobile/app/controller/edit/EditHyperlink'
,'spreadsheeteditor/mobile/app/controller/add/AddChart' ,'spreadsheeteditor/mobile/app/controller/add/AddContainer'
,'spreadsheeteditor/mobile/app/controller/add/AddFunction' ,'spreadsheeteditor/mobile/app/controller/add/AddChart'
,'spreadsheeteditor/mobile/app/controller/add/AddShape' ,'spreadsheeteditor/mobile/app/controller/add/AddFunction'
,'spreadsheeteditor/mobile/app/controller/add/AddOther' ,'spreadsheeteditor/mobile/app/controller/add/AddShape'
,'spreadsheeteditor/mobile/app/controller/add/AddLink' ,'spreadsheeteditor/mobile/app/controller/add/AddOther'
,'spreadsheeteditor/mobile/app/controller/FilterOptions' ,'spreadsheeteditor/mobile/app/controller/add/AddLink'
,'common/mobile/lib/controller/Collaboration' ,'spreadsheeteditor/mobile/app/controller/FilterOptions'
], function() { ,'common/mobile/lib/controller/Collaboration'
window.compareVersions = true; ], function() {
app.start(); window.compareVersions = true;
app.start();
});
}); });
}, function(err) { }, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {

62
apps/spreadsheeteditor/mobile/app.js
View file

@ -150,8 +150,6 @@ require([
] ]
}); });
Common.Locale.apply();
var device = Framework7.prototype.device; var device = Framework7.prototype.device;
var loadPlatformCss = function (filename, opt){ var loadPlatformCss = function (filename, opt){
var fileref = document.createElement('link'); var fileref = document.createElement('link');
@ -193,35 +191,37 @@ require([
//Load platform styles //Load platform styles
loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css'); loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css');
require([ Common.Locale.apply(function(){
'common/main/lib/util/LocalStorage', require([
'common/main/lib/util/utils', 'common/main/lib/util/LocalStorage',
'common/mobile/lib/controller/Plugins', 'common/main/lib/util/utils',
'spreadsheeteditor/mobile/app/controller/Editor', 'common/mobile/lib/controller/Plugins',
'spreadsheeteditor/mobile/app/controller/Toolbar', 'spreadsheeteditor/mobile/app/controller/Editor',
'spreadsheeteditor/mobile/app/controller/Search', 'spreadsheeteditor/mobile/app/controller/Toolbar',
'spreadsheeteditor/mobile/app/controller/Main', 'spreadsheeteditor/mobile/app/controller/Search',
'spreadsheeteditor/mobile/app/controller/DocumentHolder' 'spreadsheeteditor/mobile/app/controller/Main',
,'spreadsheeteditor/mobile/app/controller/CellEditor' 'spreadsheeteditor/mobile/app/controller/DocumentHolder'
,'spreadsheeteditor/mobile/app/controller/Statusbar' ,'spreadsheeteditor/mobile/app/controller/CellEditor'
,'spreadsheeteditor/mobile/app/controller/Settings' ,'spreadsheeteditor/mobile/app/controller/Statusbar'
,'spreadsheeteditor/mobile/app/controller/edit/EditContainer' ,'spreadsheeteditor/mobile/app/controller/Settings'
,'spreadsheeteditor/mobile/app/controller/edit/EditCell' ,'spreadsheeteditor/mobile/app/controller/edit/EditContainer'
,'spreadsheeteditor/mobile/app/controller/edit/EditText' ,'spreadsheeteditor/mobile/app/controller/edit/EditCell'
,'spreadsheeteditor/mobile/app/controller/edit/EditImage' ,'spreadsheeteditor/mobile/app/controller/edit/EditText'
,'spreadsheeteditor/mobile/app/controller/edit/EditShape' ,'spreadsheeteditor/mobile/app/controller/edit/EditImage'
,'spreadsheeteditor/mobile/app/controller/edit/EditChart' ,'spreadsheeteditor/mobile/app/controller/edit/EditShape'
,'spreadsheeteditor/mobile/app/controller/edit/EditHyperlink' ,'spreadsheeteditor/mobile/app/controller/edit/EditChart'
,'spreadsheeteditor/mobile/app/controller/add/AddContainer' ,'spreadsheeteditor/mobile/app/controller/edit/EditHyperlink'
,'spreadsheeteditor/mobile/app/controller/add/AddChart' ,'spreadsheeteditor/mobile/app/controller/add/AddContainer'
,'spreadsheeteditor/mobile/app/controller/add/AddFunction' ,'spreadsheeteditor/mobile/app/controller/add/AddChart'
,'spreadsheeteditor/mobile/app/controller/add/AddShape' ,'spreadsheeteditor/mobile/app/controller/add/AddFunction'
,'spreadsheeteditor/mobile/app/controller/add/AddOther' ,'spreadsheeteditor/mobile/app/controller/add/AddShape'
,'spreadsheeteditor/mobile/app/controller/add/AddLink' ,'spreadsheeteditor/mobile/app/controller/add/AddOther'
,'spreadsheeteditor/mobile/app/controller/FilterOptions' ,'spreadsheeteditor/mobile/app/controller/add/AddLink'
,'common/mobile/lib/controller/Collaboration' ,'spreadsheeteditor/mobile/app/controller/FilterOptions'
], function() { ,'common/mobile/lib/controller/Collaboration'
app.start(); ], function() {
app.start();
});
}); });
}, function(err) { }, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) { if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {