diff options
author | primalmotion <antoine.mercadal@inframonde.eu> | 2010-08-04 18:10:36 +0200 |
---|---|---|
committer | primalmotion <antoine.mercadal@inframonde.eu> | 2010-08-04 18:10:36 +0200 |
commit | 11f3271a52505dccbf38bea422e7c9a79dddd478 (patch) | |
tree | bfdfc91bf21fbecf7c0d681ff11d5ae640660108 | |
parent | 8ded53c1de06d01e50d58543c19e73926f0fbbd4 (diff) | |
download | websockify-primalmotion/master.tar.gz |
* take care of kanaka's suggestionsprimalmotion/master
-rw-r--r-- | include/canvas.js | 18 | ||||
-rw-r--r-- | include/rfb.js | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/canvas.js b/include/canvas.js index 38429bb..a2848fd 100644 --- a/include/canvas.js +++ b/include/canvas.js @@ -41,7 +41,7 @@ Util.conf_default(conf, that, 'true_color', true); Util.conf_default(conf, that, 'focused', true); Util.conf_default(conf, that, 'colourMap', []); Util.conf_default(conf, that, 'scale', 1); -Util.conf_default(conf, that, 'currentDocument', document); +Util.conf_default(conf, that, 'focusContainer', document); // Override some specific getters/setters that.set_prefer_js = function(val) { @@ -385,8 +385,8 @@ that.start = function(keyPressFunc, mouseButtonFunc, mouseMoveFunc) { c_mouseButton = mouseButtonFunc || null; c_mouseMove = mouseMoveFunc || null; - Util.addEvent(conf.currentDocument, 'keydown', onKeyDown); - Util.addEvent(conf.currentDocument, 'keyup', onKeyUp); + Util.addEvent(conf.focusContainer, 'keydown', onKeyDown); + Util.addEvent(conf.focusContainer, 'keyup', onKeyUp); Util.addEvent(c, 'mousedown', onMouseDown); Util.addEvent(c, 'mouseup', onMouseUp); Util.addEvent(c, 'mousemove', onMouseMove); @@ -394,8 +394,8 @@ that.start = function(keyPressFunc, mouseButtonFunc, mouseMoveFunc) { onMouseWheel); /* Work around right and middle click browser behaviors */ - Util.addEvent(conf.currentDocument, 'click', onMouseDisable); - Util.addEvent(conf.currentDocument.body, 'contextmenu', onMouseDisable); + Util.addEvent(conf.focusContainer, 'click', onMouseDisable); + Util.addEvent(conf.focusContainer.body, 'contextmenu', onMouseDisable); Util.Debug("<< Canvas.start"); }; @@ -465,8 +465,8 @@ that.clear = function() { that.stop = function() { var c = conf.target; - Util.removeEvent(conf.currentDocument, 'keydown', onKeyDown); - Util.removeEvent(conf.currentDocument, 'keyup', onKeyUp); + Util.removeEvent(conf.focusContainer, 'keydown', onKeyDown); + Util.removeEvent(conf.focusContainer, 'keyup', onKeyUp); Util.removeEvent(c, 'mousedown', onMouseDown); Util.removeEvent(c, 'mouseup', onMouseUp); Util.removeEvent(c, 'mousemove', onMouseMove); @@ -474,8 +474,8 @@ that.stop = function() { onMouseWheel); /* Work around right and middle click browser behaviors */ - Util.removeEvent(conf.currentDocument, 'click', onMouseDisable); - Util.removeEvent(conf.currentDocument.body, 'contextmenu', onMouseDisable); + Util.removeEvent(conf.focusContainer, 'click', onMouseDisable); + Util.removeEvent(conf.focusContainer.body, 'contextmenu', onMouseDisable); // Turn off cursor rendering if (conf.cursor_uri) { diff --git a/include/rfb.js b/include/rfb.js index 019103a..f71ccdb 100644 --- a/include/rfb.js +++ b/include/rfb.js @@ -131,7 +131,7 @@ var that = {}, // Public API interface // // VNC viewport rendering Canvas -//Util.conf_default(conf, that, 'target', 'VNC_canvas'); +Util.conf_default(conf, that, 'target', 'VNC_canvas'); Util.conf_default(conf, that, 'encrypt', false, true); Util.conf_default(conf, that, 'true_color', true, true); @@ -139,7 +139,7 @@ Util.conf_default(conf, that, 'true_color', true, true); Util.conf_default(conf, that, 'b64encode', true, true); Util.conf_default(conf, that, 'local_cursor', true, true); -Util.conf_default(conf, that, 'currentDocument', true, document); +Util.conf_default(conf, that, 'focusContainer', document); // time to wait for connection Util.conf_default(conf, that, 'connectTimeout', 2000); @@ -196,7 +196,7 @@ function constructor() { } // Initialize canvas try { - canvas = new Canvas({'target': conf.target, 'currentDocument': conf.currentDocument}); + canvas = new Canvas({'target': conf.target, 'focusContainer': conf.focusContainer}); } catch (exc) { Util.Error("Canvas exception: " + exc); updateState('fatal', "No working Canvas"); |