crabapples
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 2f3b9fe527 into cbb55df039

This commit is contained in:
YAMAMOTO Takashi 2012-09-05 19:40:34 -07:00
parent cbb55df039 2f3b9fe527
commit 71d9f9308a
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/display.js
View File

@ -174,11 +174,6 @@ rescale = function(factor) {
factor = 0.1; factor = 0.1;
} }
if (conf.scale === factor) {
//Util.Debug("Display already scaled to '" + factor + "'");
return;
}
conf.scale = factor; conf.scale = factor;
x = c.width - c.width * factor; x = c.width - c.width * factor;
y = c.height - c.height * factor; y = c.height - c.height * factor;

13
include/webutil.js
View File

@ -37,11 +37,14 @@ if (!window.$D) {
*/ */
// init log level reading the logging HTTP param // init log level reading the logging HTTP param
WebUtil.init_logging = function() { WebUtil.init_logging = function(level) {
Util._log_level = (document.location.href.match( if (typeof level === 'undefined') {
/logging=([A-Za-z0-9\._\-]*)/) || Util._log_level = (document.location.href.match(
['', Util._log_level])[1]; /logging=([A-Za-z0-9\._\-]*)/) ||
['', Util._log_level])[1];
} else {
Util._log_level = level;
}
Util.init_logging(); Util.init_logging();
}; };
WebUtil.init_logging(); WebUtil.init_logging();