lzh/websockify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* take care of kanaka's suggestions

Browse Source
This commit is contained in:
primalmotion
2010-08-04 18:10:36 +02:00
parent 8ded53c1de
commit 11f3271a52
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/canvas.js
+9 -9
View File
@@ -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) {