From 0a025d3d4e58040fb9fae03f7dc7536066db9d17 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Sun, 11 Aug 2024 13:58:41 +0300
Subject: [PATCH] Refactoring

---
 apps/documenteditor/main/app/controller/Main.js           | 6 ++----
 apps/documenteditor/main/app/view/DocumentHolderExt.js    | 7 +++++++
 apps/spreadsheeteditor/main/app/controller/Main.js        | 5 ++---
 apps/spreadsheeteditor/main/app/view/DocumentHolderExt.js | 3 +++
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index 9d25dede70..3df2ce279f 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -1441,8 +1441,7 @@ define([
                             clearInterval(timer_sl);
 
                             toolbarController.createDelayedElements();
-
-                            // documentHolderController.getView().createDelayedElements();
+                            documentHolderController.getView().createDelayedElements();
                             me.setLanguages();
 
                             var shapes = me.api.asc_getPropertyEditorShapes();
@@ -1470,8 +1469,7 @@ define([
                             me.api.UpdateInterfaceState();
                         }
                     }
-
-                    // documentHolderController.getView().createDelayedElementsViewer();
+                    documentHolderController.getView().createDelayedElementsViewer();
                     toolbarController.createDelayedElementsViewer();
                     Common.Utils.injectSvgIcons();
                     Common.NotificationCenter.trigger('document:ready', 'main');
diff --git a/apps/documenteditor/main/app/view/DocumentHolderExt.js b/apps/documenteditor/main/app/view/DocumentHolderExt.js
index da0e132019..ad84a157f9 100644
--- a/apps/documenteditor/main/app/view/DocumentHolderExt.js
+++ b/apps/documenteditor/main/app/view/DocumentHolderExt.js
@@ -39,6 +39,7 @@ define([], function () {
         dh.createDelayedElements = function() {
             var me = this;
 
+            if (me.menuInsertCaption || !window.styles_loaded) return; // menu is already inited or editor styles are not loaded
             me.menuInsertCaption = new Common.UI.MenuItem({
                 caption : me.txtInsertCaption
             });
@@ -2001,6 +2002,8 @@ define([], function () {
         dh.createDelayedElementsViewer = function() {
             var me = this;
 
+            if (me.menuViewCopy) return; // menu is already inited
+
             me.menuViewCopy = new Common.UI.MenuItem({
                 iconCls: 'menu__icon btn-copy',
                 caption: me.textCopy,
@@ -2131,6 +2134,8 @@ define([], function () {
         dh.createDelayedElementsPDFViewer = function() {
             var me = this;
 
+            if (me.menuPDFViewCopy) return; // menu is already inited
+
             me.menuPDFViewCopy = new Common.UI.MenuItem({
                 iconCls: 'menu__icon btn-copy',
                 caption: me.textCopy,
@@ -2162,6 +2167,8 @@ define([], function () {
         dh.createDelayedElementsPDFForms = function() {
             var me = this;
 
+            if (me.menuPDFFormsCopy) return; // menu is already inited
+
             me.menuPDFFormsCopy = new Common.UI.MenuItem({
                 iconCls: 'menu__icon btn-copy',
                 caption: me.textCopy,
diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js
index fd18c11661..491a1ed8d4 100644
--- a/apps/spreadsheeteditor/main/app/controller/Main.js
+++ b/apps/spreadsheeteditor/main/app/controller/Main.js
@@ -1086,8 +1086,7 @@ define([
                             clearInterval(timer_sl);
 
                             Common.NotificationCenter.trigger('comments:updatefilter', ['doc', 'sheet' + me.api.asc_getActiveWorksheetId()]);
-
-                            // documentHolderView.createDelayedElements();
+                            documentHolderView.createDelayedElements();
                             toolbarController.createDelayedElements();
                             // me.setLanguages();
 
@@ -1122,7 +1121,7 @@ define([
                 } else {
                     var formulasDlgController = application.getController('FormulaDialog');
                     formulasDlgController && formulasDlgController.setMode(me.appOptions).setApi(me.api);
-                    // documentHolderView.createDelayedElementsViewer();
+                    documentHolderView.createDelayedElementsViewer();
                     Common.Utils.injectSvgIcons();
                     Common.NotificationCenter.trigger('document:ready', 'main');
                     me.applyLicense();
diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolderExt.js b/apps/spreadsheeteditor/main/app/view/DocumentHolderExt.js
index 44cf27f607..9dceab5c8a 100644
--- a/apps/spreadsheeteditor/main/app/view/DocumentHolderExt.js
+++ b/apps/spreadsheeteditor/main/app/view/DocumentHolderExt.js
@@ -39,6 +39,8 @@ define([], function () {
         dh.createDelayedElementsViewer = function() {
             var me = this;
 
+            if (me.menuViewCopy) return; // menu is already inited
+
             me.menuViewCopy = new Common.UI.MenuItem({
                 iconCls: 'menu__icon btn-copy',
                 caption: me.txtCopy,
@@ -96,6 +98,7 @@ define([], function () {
         dh.createDelayedElements = function() {
             var me = this;
 
+            if (me.pmiCut || !(window.styles_loaded || me.mode.isEditDiagram || me.mode.isEditMailMerge || me.mode.isEditOle)) return; // menu is already inited or editor styles are not loaded
             me.pmiCut = new Common.UI.MenuItem({
                 iconCls: 'menu__icon btn-cut',
                 caption     : me.txtCut,