[desktop] refactoring
This commit is contained in:
parent
40061edafa
commit
ba4e125ba1
|
@ -66,12 +66,12 @@ define([
|
|||
spriteCols = 1,
|
||||
applicationPixelRatio = Common.Utils.applicationPixelRatio();
|
||||
|
||||
if (typeof window['AscDesktopEditor'] === 'object') {
|
||||
thumbs[0].path = window['AscDesktopEditor'].getFontsSprite('');
|
||||
thumbs[1].path = window['AscDesktopEditor'].getFontsSprite('@1.25x');
|
||||
thumbs[2].path = window['AscDesktopEditor'].getFontsSprite('@1.5x');
|
||||
thumbs[3].path = window['AscDesktopEditor'].getFontsSprite('@1.75x');
|
||||
thumbs[4].path = window['AscDesktopEditor'].getFontsSprite('@2x');
|
||||
if ( Common.Controllers.Desktop.isActive() ) {
|
||||
thumbs[0].path = Common.Controllers.Desktop.call('getFontsSprite');
|
||||
thumbs[1].path = Common.Controllers.Desktop.call('getFontsSprite', '@1.25x');
|
||||
thumbs[2].path = Common.Controllers.Desktop.call('getFontsSprite', '@1.5x');
|
||||
thumbs[3].path = Common.Controllers.Desktop.call('getFontsSprite', '@1.75x');
|
||||
thumbs[4].path = Common.Controllers.Desktop.call('getFontsSprite', '@2x');
|
||||
}
|
||||
|
||||
var bestDistance = Math.abs(applicationPixelRatio-thumbs[0].ratio);
|
||||
|
|
|
@ -313,6 +313,15 @@ define([
|
|||
// return webapp.getController('Main').api.asc_isOffline();
|
||||
return webapp.getController('Main').appOptions.isOffline;
|
||||
},
|
||||
isFeatureAvailable: function (feature) {
|
||||
return !!native && !!native[feature];
|
||||
},
|
||||
call: function (name) {
|
||||
if ( native[name] ) {
|
||||
let args = [].slice.call(arguments, 1);
|
||||
return native[name](...args);
|
||||
}
|
||||
},
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -176,6 +176,9 @@ require([
|
|||
Common.Locale.apply(
|
||||
function() {
|
||||
require([
|
||||
'common/main/lib/util/LocalStorage',
|
||||
'common/main/lib/controller/Themes',
|
||||
'common/main/lib/controller/Desktop',
|
||||
'documenteditor/main/app/controller/Viewport',
|
||||
'documenteditor/main/app/controller/DocumentHolder',
|
||||
'documenteditor/main/app/controller/Toolbar',
|
||||
|
@ -197,7 +200,6 @@ require([
|
|||
'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 **/
|
||||
|
@ -211,8 +213,6 @@ require([
|
|||
,'common/main/lib/controller/ExternalOleEditor'
|
||||
,'common/main/lib/controller/ReviewChanges'
|
||||
,'common/main/lib/controller/Protection'
|
||||
,'common/main/lib/controller/Themes'
|
||||
,'common/main/lib/controller/Desktop'
|
||||
], function() {
|
||||
app.start();
|
||||
});
|
||||
|
|
|
@ -166,6 +166,9 @@ require([
|
|||
Common.Locale.apply(
|
||||
function() {
|
||||
require([
|
||||
'common/main/lib/util/LocalStorage',
|
||||
'common/main/lib/controller/Themes',
|
||||
'common/main/lib/controller/Desktop',
|
||||
'documenteditor/main/app/controller/Viewport',
|
||||
'documenteditor/main/app/controller/DocumentHolder',
|
||||
'documenteditor/main/app/controller/Toolbar',
|
||||
|
@ -187,7 +190,6 @@ require([
|
|||
'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 **/
|
||||
|
@ -201,8 +203,6 @@ require([
|
|||
,'common/main/lib/controller/ExternalOleEditor'
|
||||
,'common/main/lib/controller/ReviewChanges'
|
||||
,'common/main/lib/controller/Protection'
|
||||
,'common/main/lib/controller/Themes'
|
||||
,'common/main/lib/controller/Desktop'
|
||||
], function() {
|
||||
window.compareVersions = true;
|
||||
app.start();
|
||||
|
|
|
@ -171,6 +171,9 @@ require([
|
|||
|
||||
Common.Locale.apply(function(){
|
||||
require([
|
||||
'common/main/lib/util/LocalStorage',
|
||||
'common/main/lib/controller/Themes',
|
||||
'common/main/lib/controller/Desktop',
|
||||
'presentationeditor/main/app/controller/Viewport',
|
||||
'presentationeditor/main/app/controller/DocumentHolder',
|
||||
'presentationeditor/main/app/controller/Toolbar',
|
||||
|
@ -188,7 +191,6 @@ require([
|
|||
'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',
|
||||
'common/main/lib/controller/History'
|
||||
/** coauthoring begin **/
|
||||
|
@ -201,8 +203,6 @@ require([
|
|||
,'common/main/lib/controller/ExternalOleEditor'
|
||||
,'common/main/lib/controller/ReviewChanges'
|
||||
,'common/main/lib/controller/Protection'
|
||||
,'common/main/lib/controller/Themes'
|
||||
,'common/main/lib/controller/Desktop'
|
||||
,'presentationeditor/main/app/controller/Transitions'
|
||||
,'presentationeditor/main/app/controller/Animation'
|
||||
], function() {
|
||||
|
|
|
@ -162,6 +162,9 @@ require([
|
|||
|
||||
Common.Locale.apply(function(){
|
||||
require([
|
||||
'common/main/lib/util/LocalStorage',
|
||||
'common/main/lib/controller/Themes',
|
||||
'common/main/lib/controller/Desktop',
|
||||
'presentationeditor/main/app/controller/Viewport',
|
||||
'presentationeditor/main/app/controller/DocumentHolder',
|
||||
'presentationeditor/main/app/controller/Toolbar',
|
||||
|
@ -179,7 +182,6 @@ require([
|
|||
'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',
|
||||
'common/main/lib/controller/History'
|
||||
/** coauthoring begin **/
|
||||
|
@ -192,8 +194,6 @@ require([
|
|||
,'common/main/lib/controller/ExternalOleEditor'
|
||||
,'common/main/lib/controller/ReviewChanges'
|
||||
,'common/main/lib/controller/Protection'
|
||||
,'common/main/lib/controller/Themes'
|
||||
,'common/main/lib/controller/Desktop'
|
||||
,'presentationeditor/main/app/controller/Transitions'
|
||||
,'presentationeditor/main/app/controller/Animation'
|
||||
], function() {
|
||||
|
|
|
@ -173,6 +173,9 @@ require([
|
|||
|
||||
Common.Locale.apply(function(){
|
||||
require([
|
||||
'common/main/lib/util/LocalStorage',
|
||||
'common/main/lib/controller/Themes',
|
||||
'common/main/lib/controller/Desktop',
|
||||
'spreadsheeteditor/main/app/controller/Viewport',
|
||||
'spreadsheeteditor/main/app/controller/DocumentHolder',
|
||||
'spreadsheeteditor/main/app/controller/CellEditor',
|
||||
|
@ -198,7 +201,6 @@ require([
|
|||
'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/History',
|
||||
'common/main/lib/controller/Comments',
|
||||
|
@ -207,8 +209,6 @@ require([
|
|||
,'common/main/lib/controller/ExternalOleEditor'
|
||||
,'common/main/lib/controller/ReviewChanges'
|
||||
,'common/main/lib/controller/Protection'
|
||||
,'common/main/lib/controller/Themes'
|
||||
,'common/main/lib/controller/Desktop'
|
||||
], function() {
|
||||
app.start();
|
||||
});
|
||||
|
|
|
@ -163,6 +163,9 @@ require([
|
|||
|
||||
Common.Locale.apply(function(){
|
||||
require([
|
||||
'common/main/lib/util/LocalStorage',
|
||||
'common/main/lib/controller/Themes',
|
||||
'common/main/lib/controller/Desktop',
|
||||
'spreadsheeteditor/main/app/controller/Viewport',
|
||||
'spreadsheeteditor/main/app/controller/DocumentHolder',
|
||||
'spreadsheeteditor/main/app/controller/CellEditor',
|
||||
|
@ -188,7 +191,6 @@ require([
|
|||
'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/History',
|
||||
'common/main/lib/controller/Comments',
|
||||
|
@ -197,8 +199,6 @@ require([
|
|||
,'common/main/lib/controller/ExternalOleEditor'
|
||||
,'common/main/lib/controller/ReviewChanges'
|
||||
,'common/main/lib/controller/Protection'
|
||||
,'common/main/lib/controller/Themes'
|
||||
,'common/main/lib/controller/Desktop'
|
||||
], function() {
|
||||
window.compareVersions = true;
|
||||
app.start();
|
||||
|
|
Loading…
Reference in a new issue