Merge pull request #2877 from ONLYOFFICE/fix/bugfix

Fix/bugfix
ONLYOFFICE · Mar 6, 2024 · d621a3e · d621a3e
2 parents 08c71ac + 9375432
commit d621a3e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git 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);
         }
     </script>
 </body>

diff --git 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
@@ -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
@@ -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/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<len-1; i++) {

diff --git 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() {