From 22d56932d67c9f8e46a143ae96e8459db3ef0278 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 6 Sep 2012 11:30:16 +0900 Subject: [PATCH 1/2] fix application of log level change. it seems that the bug was introduced by commit 8d5d2c8230b9c232afd82e01039c680e8a8b0094. --- include/webutil.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/include/webutil.js b/include/webutil.js index 6722fe38..d5174299 100644 --- a/include/webutil.js +++ b/include/webutil.js @@ -37,11 +37,14 @@ if (!window.$D) { */ // init log level reading the logging HTTP param -WebUtil.init_logging = function() { - Util._log_level = (document.location.href.match( - /logging=([A-Za-z0-9\._\-]*)/) || - ['', Util._log_level])[1]; - +WebUtil.init_logging = function(level) { + if (typeof level === 'undefined') { + Util._log_level = (document.location.href.match( + /logging=([A-Za-z0-9\._\-]*)/) || + ['', Util._log_level])[1]; + } else { + Util._log_level = level; + } Util.init_logging(); }; WebUtil.init_logging(); From 2f3b9fe527a3b0b710cdfd66515062e68588bb8c Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 6 Sep 2012 08:36:05 +0900 Subject: [PATCH 2/2] remove a bogus check which makes scaling effectively no-op. --- include/display.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/include/display.js b/include/display.js index 5ad99ba4..3d5487ca 100644 --- a/include/display.js +++ b/include/display.js @@ -174,11 +174,6 @@ rescale = function(factor) { factor = 0.1; } - if (conf.scale === factor) { - //Util.Debug("Display already scaled to '" + factor + "'"); - return; - } - conf.scale = factor; x = c.width - c.width * factor; y = c.height - c.height * factor;