From 799ff4e243e9f088cd2bf88fa3ac6ff6fda34834 Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Mon, 23 Feb 2026 01:25:28 +0300 Subject: [PATCH] [DE] fix bug 80129 --- apps/documenteditor/main/app/controller/Main.js | 9 ++++++++- apps/documenteditor/main/app/controller/Statusbar.js | 2 -- apps/documenteditor/main/app/controller/ViewTab.js | 4 ++++ apps/documenteditor/main/app/view/Statusbar.js | 1 + apps/documenteditor/main/app/view/ViewTab.js | 1 + 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index d3e5d8b221..978965bbc0 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -224,6 +224,7 @@ define([ Common.Utils.InternalSettings.set("app-settings-screen-reader", value); this.api.setSpeechEnabled(value); + if ( !Common.Utils.isIE ) { if ( /^https?:\/\//.test('{{HELP_CENTER_WEB_DE}}') ) { const _url_obj = new URL('{{HELP_CENTER_WEB_DE}}'); @@ -1339,7 +1340,13 @@ define([ this.api.zoomFitToWidth(); } } else { - this.api.zoom(zf > 0 ? zf : 100); + if (Common.localStorage.getBool("de-zoom-multipage", false)) { + this.api.zoomCustomMode(); + this.api.SetMultipageViewMode(true); + + if ( lastZoom > 0 ) this.api.zoom(lastZoom); + } else + this.api.zoom(zf > 0 ? zf : 100); } value = Common.localStorage.getItem("de-show-hiddenchars"); diff --git a/apps/documenteditor/main/app/controller/Statusbar.js b/apps/documenteditor/main/app/controller/Statusbar.js index 591cc1043b..b19aea0675 100644 --- a/apps/documenteditor/main/app/controller/Statusbar.js +++ b/apps/documenteditor/main/app/controller/Statusbar.js @@ -246,8 +246,6 @@ define([ onMultiplePages: function (pressed) { if (this.api) { - this.api.zoomCustomMode(); - this.api.SetMultipageViewMode(pressed); this.statusbar.fireEvent('pages:multiplechanged', [pressed]); } }, diff --git a/apps/documenteditor/main/app/controller/ViewTab.js b/apps/documenteditor/main/app/controller/ViewTab.js index 5a2da79010..3c543e33c0 100644 --- a/apps/documenteditor/main/app/controller/ViewTab.js +++ b/apps/documenteditor/main/app/controller/ViewTab.js @@ -109,6 +109,9 @@ define([ this.view.chStatusbar.setValue(!state, true); }, this), 'pages:multiplechanged': _.bind(function (isMultiple) { + this.api.zoomCustomMode(); + this.api.SetMultipageViewMode(isMultiple); + Common.localStorage.setBool("de-zoom-multipage", isMultiple); this.view.btnMultiplePages.toggle(isMultiple); }, this) }, @@ -290,6 +293,7 @@ define([ if (this.api) { this.api.zoomCustomMode(); this.api.SetMultipageViewMode(pressed); + Common.localStorage.setBool("de-zoom-multipage", pressed); this.view.fireEvent('pages:multiplechanged', [pressed]); } }, diff --git a/apps/documenteditor/main/app/view/Statusbar.js b/apps/documenteditor/main/app/view/Statusbar.js index 6042ee33e5..55f030bcf3 100644 --- a/apps/documenteditor/main/app/view/Statusbar.js +++ b/apps/documenteditor/main/app/view/Statusbar.js @@ -220,6 +220,7 @@ define([ this.btnMultiplePages = new Common.UI.Button({ hintAnchor: 'top', toggleGroup: 'multiple-pages', + pressed: Common.localStorage.getBool("de-zoom-multipage", false), enableToggle: true }); diff --git a/apps/documenteditor/main/app/view/ViewTab.js b/apps/documenteditor/main/app/view/ViewTab.js index a22c365764..767a353346 100644 --- a/apps/documenteditor/main/app/view/ViewTab.js +++ b/apps/documenteditor/main/app/view/ViewTab.js @@ -312,6 +312,7 @@ define([ iconCls: 'toolbar__icon btn-multiple-pages', lock: [_set.lostConnect, _set.disableOnStart], caption: this.textMultiplePages, + pressed: Common.localStorage.getBool("de-zoom-multipage", false), enableToggle: true, dataHint: '1', dataHintDirection: 'bottom',