openstack/deb-novnc
Code Issues Proposed changes

Remove event handlers on disconnect.

Browse Source
This commit is contained in:
Joel Martin 2010-04-13 09:39:29 -05:00
parent b7ec54870a
commit 2bcb2d5b15
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
canvas.js
View File

@ -52,8 +52,6 @@ init: function (id, width, height, keyDown, keyUp, mouseDown, mouseUp) {
if (! mouseUp) mouseUp = Canvas.mouseUp; if (! mouseUp) mouseUp = Canvas.mouseUp;
var c = $(Canvas.id); var c = $(Canvas.id);
c.width = width;
c.height = height;
document.addEvent('keydown', keyDown); document.addEvent('keydown', keyDown);
document.addEvent('keyup', keyUp); document.addEvent('keyup', keyUp);
c.addEvent('mousedown', mouseDown); c.addEvent('mousedown', mouseDown);
@ -63,6 +61,8 @@ init: function (id, width, height, keyDown, keyUp, mouseDown, mouseUp) {
document.addEvent('click', Canvas.ctxDisable); document.addEvent('click', Canvas.ctxDisable);
document.body.addEvent('contextmenu', Canvas.ctxDisable); document.body.addEvent('contextmenu', Canvas.ctxDisable);
c.width = width;
c.height = height;
Canvas.c_x = c.getPosition().x; Canvas.c_x = c.getPosition().x;
Canvas.c_y = c.getPosition().y; Canvas.c_y = c.getPosition().y;
Canvas.c_wx = c.getSize().x; Canvas.c_wx = c.getSize().x;
@ -77,8 +77,17 @@ init: function (id, width, height, keyDown, keyUp, mouseDown, mouseUp) {
clear: function () { clear: function () {
Canvas.ctx.clearRect(0, 0, Canvas.c_wx, Canvas.c_wy); Canvas.ctx.clearRect(0, 0, Canvas.c_wx, Canvas.c_wy);
var c = $(Canvas.id); var c = $(Canvas.id);
document.removeEvents('keydown');
document.removeEvents('keyup');
c.removeEvents('mousedown');
c.removeEvents('mouseup');
/* Work around right and middle click browser behaviors */
document.removeEvents('click');
document.body.removeEvents('contextmenu');
c.width = 640; c.width = 640;
c.height = 100; c.height = 20;
}, },
draw: function () { draw: function () {

2
vnc.html
View File

@ -12,7 +12,7 @@
<br><br> <br><br>
<div id='status'>Disconnected</div> <div id='status'>Disconnected</div>
<canvas id="vnc" width="640" height="100" <canvas id="vnc" width="640" height="20"
style="border-style: dotted; border-width: 1px;"> style="border-style: dotted; border-width: 1px;">
Canvas not supported. Canvas not supported.
</canvas> </canvas>