Merge pull request 'fix/dh-refactoring' (#190) from fix/dh-refactorin…

…g into release/v8.3.0
ONLYOFFICE · Dec 18, 2024 · 218e610 · 218e610
2 parents 2a65945 + 0f59e0f
commit 218e610
Show file tree

Hide file tree

Showing 14 changed files with 9,031 additions and 8,981 deletions.
diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js
diff --git a/apps/documenteditor/main/app/controller/DocumentHolderExt.js b/apps/documenteditor/main/app/controller/DocumentHolderExt.js
diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js
@@ -227,6 +227,7 @@ require([
                     'common/main/lib/view/MacrosDialog',
                     'common/main/lib/component/AceEditor',
 
+                    'documenteditor/main/app/controller/DocumentHolderExt',
                     'documenteditor/main/app/view/FileMenuPanels',
                     'documenteditor/main/app/view/DocumentHolderExt',
                     'documenteditor/main/app/view/ParagraphSettingsAdvanced',

diff --git a/apps/documenteditor/main/app_pack.js b/apps/documenteditor/main/app_pack.js
@@ -32,6 +32,7 @@ require([
     'common/main/lib/view/MacrosDialog',
     'common/main/lib/component/AceEditor',
 
+    'documenteditor/main/app/controller/DocumentHolderExt',
     'documenteditor/main/app/view/FileMenuPanels',
     'documenteditor/main/app/view/DocumentHolderExt',
     'documenteditor/main/app/view/ParagraphSettingsAdvanced',

diff --git a/apps/pdfeditor/main/app/controller/DocumentHolder.js b/apps/pdfeditor/main/app/controller/DocumentHolder.js
@@ -167,13 +167,10 @@ define([
 
         setApi: function(o) {
             this.api = o;
-
             if (this.api) {
                 (this.mode.isEdit === true) && this.api.asc_registerCallback('asc_onCountPages',                   _.bind(this.onCountPages, this));
-
                 this.documentHolder.setApi(this.api);
             }
-
             return this;
         },
 

diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js
diff --git a/apps/presentationeditor/main/app/controller/DocumentHolderExt.js b/apps/presentationeditor/main/app/controller/DocumentHolderExt.js
diff --git a/apps/presentationeditor/main/app/view/DocumentHolderExt.js b/apps/presentationeditor/main/app/view/DocumentHolderExt.js
@@ -216,6 +216,7 @@ define([], function () {
             me.mnuGuides = new Common.UI.MenuItem({
                 caption     : me.textGuides,
                 menu        : new Common.UI.Menu({
+                    cls: 'shifted-right',
                     menuAlign: 'tl-tr',
                     items: [
                         { caption: me.textShowGuides, value: 'show', checkable: true },
@@ -232,6 +233,7 @@ define([], function () {
             me.mnuGridlines = new Common.UI.MenuItem({
                 caption     : me.textGridlines,
                 menu        : new Common.UI.Menu({
+                    cls: 'shifted-right',
                     menuAlign: 'tl-tr',
                     items: [
                         { caption: me.textShowGridlines, value: 'show', checkable: true },

diff --git a/apps/presentationeditor/main/app_dev.js b/apps/presentationeditor/main/app_dev.js
@@ -222,7 +222,8 @@ require([
                 'common/main/lib/view/DocumentPropertyDialog',
                 'common/main/lib/view/MacrosDialog',
                 'common/main/lib/component/AceEditor',
-
+
+                'presentationeditor/main/app/controller/DocumentHolderExt',
                 'presentationeditor/main/app/view/FileMenuPanels',
                 'presentationeditor/main/app/view/DocumentHolderExt',
                 'presentationeditor/main/app/view/ParagraphSettingsAdvanced',

diff --git a/apps/presentationeditor/main/app_pack.js b/apps/presentationeditor/main/app_pack.js
@@ -28,7 +28,8 @@ require([
     'common/main/lib/view/DocumentPropertyDialog',
     'common/main/lib/view/MacrosDialog',
     'common/main/lib/component/AceEditor',
-
+
+    'presentationeditor/main/app/controller/DocumentHolderExt',
     'presentationeditor/main/app/view/FileMenuPanels',
     'presentationeditor/main/app/view/DocumentHolderExt',
     'presentationeditor/main/app/view/ParagraphSettingsAdvanced',

diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolderExt.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolderExt.js
diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js
@@ -221,7 +221,8 @@ require([
                 'common/main/lib/view/DocumentPropertyDialog',
                 'common/main/lib/view/MacrosDialog',
                 'common/main/lib/component/AceEditor',
-
+
+                'spreadsheeteditor/main/app/controller/DocumentHolderExt',
                 'spreadsheeteditor/main/app/view/FileMenuPanels',
                 'spreadsheeteditor/main/app/view/DocumentHolderExt',
                 'spreadsheeteditor/main/app/view/PivotShowDetailDialog',

diff --git a/apps/spreadsheeteditor/main/app_pack.js b/apps/spreadsheeteditor/main/app_pack.js
@@ -27,7 +27,8 @@ require([
     'common/main/lib/view/DocumentPropertyDialog',
     'common/main/lib/view/MacrosDialog',
     'common/main/lib/component/AceEditor',
-
+
+    'spreadsheeteditor/main/app/controller/DocumentHolderExt',
     'spreadsheeteditor/main/app/view/FileMenuPanels',
     'spreadsheeteditor/main/app/view/DocumentHolderExt',
     'spreadsheeteditor/main/app/view/PivotShowDetailDialog',