From 28708baf62351df8698567c1f855ee4c35625e69 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Sun, 8 May 2016 15:58:22 +0300 Subject: [PATCH] minor tweaking... Signed-off-by: Alex A. Naanou --- ui (gen4)/css/layout.less | 2 ++ ui (gen4)/features/app.js | 3 ++- ui (gen4)/features/ui-widgets.js | 1 + ui (gen4)/package.json | 4 +--- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ui (gen4)/css/layout.less b/ui (gen4)/css/layout.less index bcc4a54c..b130e8fa 100755 --- a/ui (gen4)/css/layout.less +++ b/ui (gen4)/css/layout.less @@ -303,6 +303,8 @@ button:hover { opacity: 0.4; size: 30px; + + cursor: default; } .fullscreen-controls:hover { opacity: 1; diff --git a/ui (gen4)/features/app.js b/ui (gen4)/features/app.js index 284381c0..76897d93 100755 --- a/ui (gen4)/features/app.js +++ b/ui (gen4)/features/app.js @@ -54,6 +54,7 @@ var AppControlActions = actions.Actions({ }], restoreWindowGeometry: ['- Interface/Restore window state', function(){ + var that = this // or global.window.nwDispatcher.requireNwGui() // (see: https://github.com/rogerwang/node-webkit/issues/707) var win = nw.Window.get() @@ -100,7 +101,7 @@ var AppControlActions = actions.Actions({ // XXX check if we are full screen... if(cfg != null && cfg.fullscreen && !win.isFullscreen){ - this.toggleFullScreen('on') + that.toggleFullScreen('on') } }, this.config['window-delay-initial-display'] || 0) }], diff --git a/ui (gen4)/features/ui-widgets.js b/ui (gen4)/features/ui-widgets.js index f5786e69..4a23241c 100755 --- a/ui (gen4)/features/ui-widgets.js +++ b/ui (gen4)/features/ui-widgets.js @@ -388,6 +388,7 @@ module.makeUIDialog = function(a, b){ var makeDrawer = function(direction){ return makeUIContainer(function(dialog, options){ + var that = this var parent = (options || {}).parentElement parent = parent ? $(parent) : this.ribbons.viewer diff --git a/ui (gen4)/package.json b/ui (gen4)/package.json index 484e1ab7..6c264cb6 100755 --- a/ui (gen4)/package.json +++ b/ui (gen4)/package.json @@ -13,9 +13,7 @@ "toolbar": false, "show": false }, - "webkit": { - "page-cache": true - }, + "chromium-args": "", "dependencies": { "app-module-path": "^1.0.6", "commander": "^2.9.0",