From 2e9d146d4206c0bf9d3d3d280c0b9ecd92b48f28 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 14 Aug 2024 11:56:43 +0300 Subject: [PATCH] Check if script is loaded --- apps/documenteditor/main/app/controller/DocumentHolder.js | 8 ++++++++ apps/documenteditor/main/app/view/ImageSettings.js | 1 + apps/documenteditor/main/app/view/MailMergeSettings.js | 1 + apps/pdfeditor/main/app/view/ChartSettings.js | 1 + apps/pdfeditor/main/app/view/ImageSettings.js | 1 + .../main/app/controller/DocumentHolder.js | 3 +++ apps/presentationeditor/main/app/view/ImageSettings.js | 1 + .../main/app/controller/DocumentHolder.js | 2 ++ apps/spreadsheeteditor/main/app/controller/Toolbar.js | 4 ++-- apps/spreadsheeteditor/main/app/view/ChartSettings.js | 2 +- apps/spreadsheeteditor/main/app/view/ImageSettings.js | 1 + 11 files changed, 22 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js index 12e05cb0b5..1c3beafd7c 100644 --- a/apps/documenteditor/main/app/controller/DocumentHolder.js +++ b/apps/documenteditor/main/app/controller/DocumentHolder.js @@ -1412,6 +1412,8 @@ define([ }, onEditObject: function() { + if (!Common.Controllers.LaunchController.isScriptLoaded()) return; + if (this.api) { var oleobj = this.api.asc_canEditTableOleObject(true); if (oleobj) { @@ -1428,6 +1430,8 @@ define([ }, onDoubleClickOnChart: function(chart) { + if (!Common.Controllers.LaunchController.isScriptLoaded()) return; + var docProtection = this.documentHolder._docProtection; if (this.mode.isEdit && !(this._isDisabled || docProtection.isReadOnly || docProtection.isFormsOnly || docProtection.isCommentsOnly)) { var diagramEditor = this.getApplication().getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor'); @@ -1440,6 +1444,8 @@ define([ }, onDoubleClickOnTableOleObject: function(chart) { + if (!Common.Controllers.LaunchController.isScriptLoaded()) return; + var docProtection = this.documentHolder._docProtection; if (this.mode.isEdit && !(this._isDisabled || docProtection.isReadOnly || docProtection.isFormsOnly || docProtection.isCommentsOnly)) { var oleEditor = this.getApplication().getController('Common.Controllers.ExternalOleEditor').getView('Common.Views.ExternalOleEditor'); @@ -1833,6 +1839,8 @@ define([ }, editChartClick: function(){ + if (!Common.Controllers.LaunchController.isScriptLoaded()) return; + var diagramEditor = DE.getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor'); if (diagramEditor) { diagramEditor.setEditMode(true); diff --git a/apps/documenteditor/main/app/view/ImageSettings.js b/apps/documenteditor/main/app/view/ImageSettings.js index b1cc4bd16a..56e78ede4f 100644 --- a/apps/documenteditor/main/app/view/ImageSettings.js +++ b/apps/documenteditor/main/app/view/ImageSettings.js @@ -179,6 +179,7 @@ define([ this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this)); this.btnEditObject.on('click', _.bind(function(btn){ + if (!Common.Controllers.LaunchController.isScriptLoaded()) return; if (this.api) { var oleobj = this.api.asc_canEditTableOleObject(true); if (oleobj) { diff --git a/apps/documenteditor/main/app/view/MailMergeSettings.js b/apps/documenteditor/main/app/view/MailMergeSettings.js index b70f1ca372..90c59c4145 100644 --- a/apps/documenteditor/main/app/view/MailMergeSettings.js +++ b/apps/documenteditor/main/app/view/MailMergeSettings.js @@ -475,6 +475,7 @@ define([ }, onEditData: function() { + if (!Common.Controllers.LaunchController.isScriptLoaded()) return; var mergeEditor = DE.getController('Common.Controllers.ExternalMergeEditor').getView('Common.Views.ExternalMergeEditor'); if (mergeEditor) { mergeEditor.show(); diff --git a/apps/pdfeditor/main/app/view/ChartSettings.js b/apps/pdfeditor/main/app/view/ChartSettings.js index 6290cde44f..891d9287d9 100644 --- a/apps/pdfeditor/main/app/view/ChartSettings.js +++ b/apps/pdfeditor/main/app/view/ChartSettings.js @@ -558,6 +558,7 @@ define([ }, setEditData: function() { + if (!Common.Controllers.LaunchController.isScriptLoaded()) return; var diagramEditor = PE.getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor'); if (diagramEditor) { diagramEditor.setEditMode(true); diff --git a/apps/pdfeditor/main/app/view/ImageSettings.js b/apps/pdfeditor/main/app/view/ImageSettings.js index 967cf0400f..047ea520da 100644 --- a/apps/pdfeditor/main/app/view/ImageSettings.js +++ b/apps/pdfeditor/main/app/view/ImageSettings.js @@ -144,6 +144,7 @@ define([ this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this)); this.btnEditObject.on('click', _.bind(function(btn){ + if (!Common.Controllers.LaunchController.isScriptLoaded()) return; if (this.api) { var oleobj = this.api.asc_canEditTableOleObject(true); if (oleobj) { diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js index fcdf2ed2c5..b799e98dc5 100644 --- a/apps/presentationeditor/main/app/controller/DocumentHolder.js +++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js @@ -1481,6 +1481,7 @@ define([ }, onDoubleClickOnTableOleObject: function(chart) { + if (!Common.Controllers.LaunchController.isScriptLoaded()) return; if (this.mode.isEdit && !this._isDisabled) { var oleEditor = PE.getController('Common.Controllers.ExternalOleEditor').getView('Common.Views.ExternalOleEditor'); if (oleEditor && chart) { @@ -1577,6 +1578,7 @@ define([ }, /** coauthoring end **/ editChartClick: function(chart, placeholder){ + if (!Common.Controllers.LaunchController.isScriptLoaded()) return; if (this.mode.isEdit && !this._isDisabled) { var diagramEditor = PE.getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor'); @@ -1592,6 +1594,7 @@ define([ }, onEditObject: function() { + if (!Common.Controllers.LaunchController.isScriptLoaded()) return; if (this.api) { var oleobj = this.api.asc_canEditTableOleObject(true); if (oleobj) { diff --git a/apps/presentationeditor/main/app/view/ImageSettings.js b/apps/presentationeditor/main/app/view/ImageSettings.js index 92a9c24573..5858b45479 100644 --- a/apps/presentationeditor/main/app/view/ImageSettings.js +++ b/apps/presentationeditor/main/app/view/ImageSettings.js @@ -144,6 +144,7 @@ define([ this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this)); this.btnEditObject.on('click', _.bind(function(btn){ + if (!Common.Controllers.LaunchController.isScriptLoaded()) return; if (this.api) { var oleobj = this.api.asc_canEditTableOleObject(true); if (oleobj) { diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 6d6c23dd3e..7c7d41830a 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -436,6 +436,7 @@ define([ }, onEditObject: function() { + if (!Common.Controllers.LaunchController.isScriptLoaded()) return; if (this.api) { var oleobj = this.api.asc_canEditTableOleObject(true); if (oleobj) { @@ -4324,6 +4325,7 @@ define([ }, onDoubleClickOnTableOleObject: function(obj) { + if (!Common.Controllers.LaunchController.isScriptLoaded()) return; if (this.permissions.isEdit && !this._isDisabled) { var oleEditor = SSE.getController('Common.Controllers.ExternalOleEditor').getView('Common.Views.ExternalOleEditor'); if (oleEditor && obj) { diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index fe0c9fb486..416dba4936 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -1108,7 +1108,7 @@ define([ }, onEditChart: function(btn) { - if (!this.editMode) return; + if (!this.editMode || !Common.Controllers.LaunchController.isScriptLoaded()) return; var me = this, info = me.api.asc_getCellInfo(); var selectType = info.asc_getSelectionType(); if (selectType !== Asc.c_oAscSelectionType.RangeImage) { @@ -1180,7 +1180,7 @@ define([ }, onEditChartType: function(btn) { - if (!this.editMode) return; + if (!this.editMode || !Common.Controllers.LaunchController.isScriptLoaded()) return; var me = this; var props; diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettings.js b/apps/spreadsheeteditor/main/app/view/ChartSettings.js index fcae540817..74dab82f79 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettings.js @@ -1114,7 +1114,7 @@ define([ }, openAdvancedSettings: function() { - if (this.linkAdvanced.hasClass('disabled')) return; + if (this.linkAdvanced.hasClass('disabled') || !Common.Controllers.LaunchController.isScriptLoaded()) return; var me = this; var win, props; diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettings.js b/apps/spreadsheeteditor/main/app/view/ImageSettings.js index 64ddd2f1fc..a4edb44d20 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ImageSettings.js @@ -213,6 +213,7 @@ define([ this.spnHeight.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);}); this.btnOriginalSize.on('click', _.bind(this.setOriginalSize, this)); this.btnEditObject.on('click', _.bind(function(btn){ + if (!Common.Controllers.LaunchController.isScriptLoaded()) return; if (this.api) { var oleobj = this.api.asc_canEditTableOleObject(true); if (oleobj) {