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

Fix old customization: don't load skeleton

Browse source
This commit is contained in:
Julia Radzhabova 2019-09-12 17:12:06 +03:00
parent 5f7b76fa89
commit 9b5c768a02
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/documenteditor/main/app/controller/Main.js
View file

@ -168,8 +168,6 @@ define([
window["flat_desine"] = true; window["flat_desine"] = true;
this.api = this.getApplication().getController('Viewport').getApi(); this.api = this.getApplication().getController('Viewport').getApi();
$('#editor_sdk').append('<div class="doc-placeholder">' + '<div class="line"></div>'.repeat(20) + '</div>');
if (this.api){ if (this.api){
this.api.SetDrawingFreeze(true); this.api.SetDrawingFreeze(true);
switch (value) { switch (value) {
@ -359,6 +357,9 @@ define([
if (this.appOptions.location == 'us' || this.appOptions.location == 'ca') if (this.appOptions.location == 'us' || this.appOptions.location == 'ca')
Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch); Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);
if (!this.editorConfig.customization || !(this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo))
$('#editor_sdk').append('<div class="doc-placeholder">' + '<div class="line"></div>'.repeat(20) + '</div>');
Common.Controllers.Desktop.init(this.appOptions); Common.Controllers.Desktop.init(this.appOptions);
}, },

5
apps/presentationeditor/main/app/controller/Main.js
View file

@ -160,8 +160,6 @@ define([
window["flat_desine"] = true; window["flat_desine"] = true;
this.api = this.getApplication().getController('Viewport').getApi(); this.api = this.getApplication().getController('Viewport').getApi();
$('#editor_sdk').append('<div class="doc-placeholder"><div class="slide-h"><div class="slide-v"><div class="slide-container"><div class="line"></div><div class="line"></div></div></div></div></div>');
if (this.api){ if (this.api){
this.api.SetDrawingFreeze(true); this.api.SetDrawingFreeze(true);
this.api.SetThemesPath("../../../../sdkjs/slide/themes/"); this.api.SetThemesPath("../../../../sdkjs/slide/themes/");
@ -329,6 +327,9 @@ define([
if (this.appOptions.location == 'us' || this.appOptions.location == 'ca') if (this.appOptions.location == 'us' || this.appOptions.location == 'ca')
Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch); Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);
if (!this.editorConfig.customization || !(this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo))
$('#editor_sdk').append('<div class="doc-placeholder"><div class="slide-h"><div class="slide-v"><div class="slide-container"><div class="line"></div><div class="line"></div></div></div></div></div>');
Common.Controllers.Desktop.init(this.appOptions); Common.Controllers.Desktop.init(this.appOptions);
}, },

7
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -152,8 +152,6 @@ define([
// viewport.applicationUI.setVisible(true); // viewport.applicationUI.setVisible(true);
} }
$('#editor_sdk').append('<div class="doc-placeholder">' + '<div class="columns"></div>'.repeat(2) + '</div>');
var value = Common.localStorage.getItem("sse-settings-fontrender"); var value = Common.localStorage.getItem("sse-settings-fontrender");
if (value===null) value = window.devicePixelRatio > 1 ? '1' : '3'; if (value===null) value = window.devicePixelRatio > 1 ? '1' : '3';
Common.Utils.InternalSettings.set("sse-settings-fontrender", value); Common.Utils.InternalSettings.set("sse-settings-fontrender", value);
@ -359,6 +357,9 @@ define([
if (this.appOptions.location == 'us' || this.appOptions.location == 'ca') if (this.appOptions.location == 'us' || this.appOptions.location == 'ca')
Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch); Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch);
if (!this.editorConfig.customization || !(this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo))
$('#editor_sdk').append('<div class="doc-placeholder">' + '<div class="columns"></div>'.repeat(2) + '</div>');
this.isFrameClosed = (this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge); this.isFrameClosed = (this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge);
Common.Controllers.Desktop.init(this.appOptions); Common.Controllers.Desktop.init(this.appOptions);
}, },
@ -869,7 +870,7 @@ define([
} }
}); });
} }
} else if (!this.appOptions.isDesktopApp && !this.appOptions.canBrandingExt && } else if (!this.appOptions.isDesktopApp && !this.appOptions.canBrandingExt && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge) &&
this.editorConfig && this.editorConfig.customization && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)) { this.editorConfig && this.editorConfig.customization && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)) {
Common.UI.warning({ Common.UI.warning({
title: this.textPaidFeature, title: this.textPaidFeature,