diff --git a/node_modules/server.js b/node_modules/server.js index 6dbc37c1..ac106648 100644 --- a/node_modules/server.js +++ b/node_modules/server.js @@ -135,7 +135,8 @@ var Server = { // 注销prototol, 如果频繁刷新, 会报错, calling a released render if (Evt.canUseProtocol()) { - protocol.unregisterProtocol('leanote', function () { + protocol.unregisterProtocol('leanote', function (ok) { + console.log('unregisterProtocol: ' + ok) callback && callback(); }); return; @@ -229,7 +230,7 @@ var Server = { }, function (error) { if (error) { console.error('Failed to register protocol') - console.log(error); + console.error(error); } }); // }); diff --git a/public/js/app/page.js b/public/js/app/page.js index 7ebb7b5a..fe2f901f 100644 --- a/public/js/app/page.js +++ b/public/js/app/page.js @@ -1779,7 +1779,7 @@ function checkForUpdates() { function setMacTopMenu() { var isMac_ = isMac(); - var template = [ + var template = [ { label: 'Leanote', submenu: [ @@ -1868,10 +1868,11 @@ function setMacTopMenu() { submenu: [ { label: 'Reload', - accelerator: isMac_ ? 'Command+R' : 'Ctrl+R', + // 为什么不要有accelerator, cmd+r有问题, 刷新后, 再按cmd+r就不会执行这个了 + // accelerator: isMac_ ? 'Command+R' : 'Ctrl+R', click: function() { onClose(function() { - gui.win.reloadIgnoringCache(); + gui.win.reloadIgnoringCache(); }); } }, diff --git a/public/js/common.js b/public/js/common.js index f4c0aaf2..415c2bd0 100644 --- a/public/js/common.js +++ b/public/js/common.js @@ -1714,7 +1714,9 @@ var Notify = { } }; +// 关闭当前窗口 var onClose = function(afterFunc) { + console.log('on close'); try { // 先把服务/协议关掉 Server.close(function () { @@ -1727,6 +1729,7 @@ var onClose = function(afterFunc) { }); }); } catch(e) { + console.error(e); afterFunc && afterFunc(); } }