Merge pull request 'fix/bugfix' (#226) from fix/bugfix into release/v…

…8.3.0
ONLYOFFICE · Jan 15, 2025 · b9403f8 · b9403f8
2 parents e968eb0 + 6a56674
commit b9403f8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js
@@ -148,7 +148,7 @@ define([], function () {
                         "screen and (min-resolution: 2.25dppx), screen and (min-resolution: 216dpi)";
 
                     if (window.matchMedia(str_mq_125).matches) {
-                        scale.devicePixelRatio = 1.5;
+                        scale.devicePixelRatio = 1.25;
                     } else if (window.matchMedia(str_mq_150).matches) {
                         scale.devicePixelRatio = 1.5;
                     } else if (window.matchMedia(str_mq_175).matches) {

diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js
@@ -488,7 +488,7 @@ define([
             }
 
             if (me.btnStartOver) {
-                me.btnStartOver.updateHint(me.tipStartOver);
+                me.btnStartOver.updateHint(me.tipStartOver + (Common.Utils.String.platformKey(Common.Utils.isMac ? 'Ctrl+Shift+enter' : 'Ctrl+F5')));
                 me.btnStartOver.on('click', function (e) {
                     me.fireEvent('startover', me);
                 });

diff --git a/apps/pdfeditor/main/app/controller/Toolbar.js b/apps/pdfeditor/main/app/controller/Toolbar.js
@@ -1178,21 +1178,23 @@ define([
                             '<div style="width:<%= options.itemWidth %>px; height:<%= options.itemHeight %>px;"></div>',
                         '</a>'
                     ].join(''));
-                arr.forEach(function(item){
-                    var menuItem = new Common.UI.MenuItem({
-                        value: item.Type,
-                        itemWidth: item.Image.width/Common.Utils.applicationPixelRatio(),
-                        itemHeight: item.Image.height/Common.Utils.applicationPixelRatio(),
-                        template: template
-                    });
-                    menu.addItem(menuItem, true);
-                    if (menuItem.cmpEl) {
-                        menuItem.cmpEl.find('div').append(item.Image);
-                        menuItem.cmpEl.find('canvas').css({width: '100%', height: '100%'});
-                    }
+                if (arr.length>0) {
+                    arr.forEach(function(item){
+                        var menuItem = new Common.UI.MenuItem({
+                            value: item.Type,
+                            itemWidth: item.Image.width/Common.Utils.applicationPixelRatio(),
+                            itemHeight: item.Image.height/Common.Utils.applicationPixelRatio(),
+                            template: template
+                        });
+                        menu.addItem(menuItem, true);
+                        if (menuItem.cmpEl) {
+                            menuItem.cmpEl.find('div').append(item.Image);
+                            menuItem.cmpEl.find('canvas').css({width: '100%', height: '100%'});
+                        }
 
-                });
-                this.toolbar.btnStamp.options.stampType = arr[0].Type;
+                    });
+                    this.toolbar.btnStamp.options.stampType = arr[0].Type;
+                }
             }
         },