From 6e809b86617f6d3c42315f9dfb27c98c522ce44a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 6 Mar 2024 13:21:25 +0300 Subject: [PATCH 1/3] Fix Bug 65935 --- apps/documenteditor/main/app/view/Toolbar.js | 2 +- apps/pdfeditor/main/app/view/Toolbar.js | 2 +- apps/presentationeditor/main/app/view/Toolbar.js | 2 +- apps/spreadsheeteditor/main/app/view/Toolbar.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index f441542b7b..46f664b4e9 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -2924,7 +2924,7 @@ define([ createSynchTip: function () { this.synchTooltip = new Common.UI.SynchronizeTip({ extCls: (this.mode.customization && !!this.mode.customization.compactHeader) ? undefined : 'inc-index', - placement: 'right-bottom', + placement: this.mode.isDesktopApp ? 'bottom-right' : 'right-bottom', target: this.btnCollabChanges.$el }); this.synchTooltip.on('dontshowclick', function () { diff --git a/apps/pdfeditor/main/app/view/Toolbar.js b/apps/pdfeditor/main/app/view/Toolbar.js index ce659ef46e..54b9546acc 100644 --- a/apps/pdfeditor/main/app/view/Toolbar.js +++ b/apps/pdfeditor/main/app/view/Toolbar.js @@ -790,7 +790,7 @@ define([ createSynchTip: function () { this.synchTooltip = new Common.UI.SynchronizeTip({ extCls: (this.mode.customization && !!this.mode.customization.compactHeader) ? undefined : 'inc-index', - placement: 'right-bottom', + placement: this.mode.isDesktopApp ? 'bottom-right' : 'right-bottom', target: this.btnCollabChanges.$el }); this.synchTooltip.on('dontshowclick', function () { diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 953bc8a332..895bec8475 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1950,7 +1950,7 @@ define([ createSynchTip: function () { this.synchTooltip = new Common.UI.SynchronizeTip({ extCls: (this.mode.customization && !!this.mode.customization.compactHeader) ? undefined : 'inc-index', - placement: 'right-bottom', + placement: this.mode.isDesktopApp ? 'bottom-right' : 'right-bottom', target: this.btnCollabChanges.$el }); this.synchTooltip.on('dontshowclick', function () { diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 4baed947c5..3ccb1dfd81 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -3215,7 +3215,7 @@ define([ createSynchTip: function () { this.synchTooltip = new Common.UI.SynchronizeTip({ extCls: (this.mode.customization && !!this.mode.customization.compactHeader) ? undefined : 'inc-index', - placement: 'right-bottom', + placement: this.mode.isDesktopApp ? 'bottom-right' : 'right-bottom', target: this.btnCollabChanges.$el }); this.synchTooltip.on('dontshowclick', function() { From 0bd58cdd5b707511d13b592838bc316d08b3f4c6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 6 Mar 2024 14:44:44 +0300 Subject: [PATCH 2/3] Bug 66739 --- apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js index 5cbf74f419..3c8e7abe94 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js +++ b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js @@ -1912,7 +1912,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template', fillIconsLabels: function() { var arr = this.iconsControls, len = this.iconsProps.iconsLength, - regstr = new RegExp('^\s*[0-9]+[,.]?[0-9]*\s*$'); + regstr = new RegExp('^\s*[-]?[0-9]+[,.]?[0-9]*\s*$'); var val = arr[1].value.getValue(); arr[0].label.text(Common.Utils.String.format(this.textIconLabelFirst, arr[1].cmbOperator.getSelectedRecord().prevOp, regstr.test(val) ? parseFloat(val) : this.textFormula)); for (var i=1; i Date: Wed, 6 Mar 2024 14:54:09 +0300 Subject: [PATCH 3/3] For Bug 61400, Bug 59054 (wopi) --- apps/api/wopi/editor-wopi.ejs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/api/wopi/editor-wopi.ejs b/apps/api/wopi/editor-wopi.ejs index 82e45d1610..9dcc39e4b9 100644 --- a/apps/api/wopi/editor-wopi.ejs +++ b/apps/api/wopi/editor-wopi.ejs @@ -390,9 +390,11 @@ div { if (window.addEventListener) { window.addEventListener("load", connectEditor); window.addEventListener("resize", fixSize); + window.addEventListener("orientationchange", fixSize); } else if (window.attachEvent) { window.attachEvent("onload", connectEditor); window.attachEvent("onresize", fixSize); + window.attachEvent("orientationchange", fixSize); }