diff --git a/apps/common/main/lib/util/utils.js b/apps/common/main/lib/util/utils.js index 85940ecd76..724188eecf 100644 --- 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 index 5a97bfc17e..3ae8542d93 100644 --- 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 index a824ec5e52..1b8ae4a1ae 100644 --- a/apps/pdfeditor/main/app/controller/Toolbar.js +++ b/apps/pdfeditor/main/app/controller/Toolbar.js @@ -1178,21 +1178,23 @@ define([ '
', '' ].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; + } } },