Fix Bug 70442

ONLYOFFICE · Sep 25, 2024 · e35136f · e35136f
1 parent 5ab6ca3
commit e35136f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/apps/common/main/lib/controller/LaunchController.js b/apps/common/main/lib/controller/LaunchController.js
@@ -40,6 +40,7 @@ define([
             this.api = api;
             Common.NotificationCenter.on('app:ready', on_app_ready.bind(this));
             Common.NotificationCenter.on('app:face', on_hide_loader.bind(this));
+            Common.NotificationCenter.on('app-pack:loaded', on_app_pack_loaded.bind(this));
         }
 
         const load_scripts = function () {
@@ -53,14 +54,19 @@ define([
                 if (!!Common.UI.ScreenReaderFocusManager) {
                     Common.UI.ScreenReaderFocusManager.init(me.api);
                 }
-                _all_scripts_loaded = true;
 
                 if ( !!window.less ) {                                      // detect development mode
+                    _all_scripts_loaded = true;
                     Common.NotificationCenter.trigger('script:loaded');
                 }
             });
         }
 
+        const on_app_pack_loaded = function (config) {
+            _all_scripts_loaded = true;
+            Common.NotificationCenter.trigger('script:loaded');
+        }
+
         const on_app_ready = function (config) {
             load_scripts.call(this);
         }

diff --git a/apps/documenteditor/forms/app_pack.js b/apps/documenteditor/forms/app_pack.js
@@ -7,5 +7,5 @@ require([
     'common/main/lib/view/SignDialog',
     'common/main/lib/view/SignSettingsDialog',
 ], function () {
-    Common.NotificationCenter.trigger('script:loaded');
+    Common.NotificationCenter.trigger('app-pack:loaded');
 });
diff --git a/apps/documenteditor/main/app_pack.js b/apps/documenteditor/main/app_pack.js
@@ -66,5 +66,5 @@ require([
     'documenteditor/main/app/view/ProtectDialog',
     'documenteditor/main/app/view/MailMergeEmailDlg'
 ], function () {
-    Common.NotificationCenter.trigger('script:loaded');
+    Common.NotificationCenter.trigger('app-pack:loaded');
 });
diff --git a/apps/pdfeditor/main/app_pack.js b/apps/pdfeditor/main/app_pack.js
@@ -29,5 +29,5 @@ require([
     'pdfeditor/main/app/view/ShapeSettingsAdvanced',
     'pdfeditor/main/app/view/TableSettingsAdvanced'
 ], function () {
-    Common.NotificationCenter.trigger('script:loaded');
+    Common.NotificationCenter.trigger('app-pack:loaded');
 });
diff --git a/apps/presentationeditor/main/app_pack.js b/apps/presentationeditor/main/app_pack.js
@@ -40,5 +40,5 @@ require([
     'presentationeditor/main/app/view/DateTimeDialog',
     'presentationeditor/main/app/view/ChartSettingsAdvanced'
 ], function () {
-    Common.NotificationCenter.trigger('script:loaded');
+    Common.NotificationCenter.trigger('app-pack:loaded');
 });
diff --git a/apps/spreadsheeteditor/main/app_pack.js b/apps/spreadsheeteditor/main/app_pack.js
@@ -85,5 +85,5 @@ require([
     'spreadsheeteditor/main/app/view/AutoFilterDialog',
     'spreadsheeteditor/main/app/view/PivotGroupDialog',
 ], function () {
-    Common.NotificationCenter.trigger('script:loaded');
+    Common.NotificationCenter.trigger('app-pack:loaded');
 });