From e53deb90135bc11d426e384b91b10f0ecddc36eb Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Wed, 2 Oct 2024 12:50:50 +0300
Subject: [PATCH] [SSE] handle asc_onDocumentContentReady event

---
 .../embed/js/ApplicationController.js         | 24 ++++++++-----------
 .../mobile/src/controller/Main.jsx            | 13 ++++------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js
index ec5f22c09c..9b8b620273 100644
--- a/apps/spreadsheeteditor/embed/js/ApplicationController.js
+++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js
@@ -317,6 +317,12 @@ SSE.ApplicationController = new(function(){
         hidePreloader();
         onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument);
 
+        if (api) {
+            api.asc_Resize();
+            var zf = (config.customization && config.customization.zoom ? parseInt(config.customization.zoom)/100 : 1);
+            api.asc_setZoom(zf>0 ? zf : 1);
+        }
+
         var dividers = $('#box-tools .divider');
         var itemsCount = $('#box-tools a').length;
 
@@ -504,6 +510,9 @@ SSE.ApplicationController = new(function(){
 
         Common.Gateway.documentReady();
         Common.Analytics.trackEvent('Load', 'Complete');
+
+        onSheetsChanged();
+        setupScrollButtons();
     }
 
     function onEditorPermissions(params) {
@@ -564,20 +573,6 @@ SSE.ApplicationController = new(function(){
 
     function onLongActionEnd(type, id){
         if (type === Asc.c_oAscAsyncActionType.BlockInteraction) {
-            switch (id) {
-                case Asc.c_oAscAsyncAction.Open:
-                    if (api) {
-                        api.asc_Resize();
-                        var zf = (config.customization && config.customization.zoom ? parseInt(config.customization.zoom)/100 : 1);
-                        api.asc_setZoom(zf>0 ? zf : 1);
-                    }
-
-                    onDocumentContentReady();
-                    onSheetsChanged();
-                    setupScrollButtons();
-                    break;
-            }
-
             me.loadMask && me.loadMask.hide();
         }
     }
@@ -869,6 +864,7 @@ SSE.ApplicationController = new(function(){
         if (api){
             api.asc_registerCallback('asc_onEndAction',             onLongActionEnd);
             api.asc_registerCallback('asc_onError',                 onError);
+            api.asc_registerCallback('asc_onDocumentContentReady',  onDocumentContentReady);
             api.asc_registerCallback('asc_onOpenDocumentProgress',  onOpenDocument);
             api.asc_registerCallback('asc_onAdvancedOptions',       onAdvancedOptions);
             api.asc_registerCallback('asc_onSheetsChanged',         onSheetsChanged);
diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx
index 5d1d55612d..1bc0f9af09 100644
--- a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx
+++ b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx
@@ -433,12 +433,12 @@ class MainController extends Component {
             this.api.asc_enableKeyEvents(false);
         });
 
+        this.api.asc_registerCallback('asc_onDocumentContentReady',       this.onDocumentContentReady.bind(this));
         this.api.asc_registerCallback('asc_onDocumentUpdateVersion',      this.onUpdateVersion.bind(this));
         this.api.asc_registerCallback('asc_onServerVersion',              this.onServerVersion.bind(this));
         this.api.asc_registerCallback('asc_onPrintUrl',                   this.onPrintUrl.bind(this));
         this.api.asc_registerCallback('asc_onPrint',                      this.onPrint.bind(this));
         this.api.asc_registerCallback('asc_onDocumentName',               this.onDocumentName.bind(this));
-        this.api.asc_registerCallback('asc_onEndAction',                  this._onLongActionEnd.bind(this));
 
         Common.Notifications.on('download:cancel', this.onDownloadCancel.bind(this));
 
@@ -696,18 +696,13 @@ class MainController extends Component {
         }
     }
 
-    _onLongActionEnd(type, id) {
-        if ( type === Asc.c_oAscAsyncActionType.BlockInteraction && id == Asc.c_oAscAsyncAction.Open ) {
-            Common.Gateway.internalMessage('documentReady', {});
-            Common.Notifications.trigger('document:ready');
-            this.onDocumentContentReady();
-        }
-    }
-
     onDocumentContentReady() {
         if (this._isDocReady)
             return;
 
+        Common.Gateway.internalMessage('documentReady', {});
+        Common.Notifications.trigger('document:ready');
+
         const appOptions = this.props.storeAppOptions;
         const appSettings = this.props.storeApplicationSettings;