Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions CanvasInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,21 +94,30 @@
}

// setup main canvas events
self._removals = [];
if (self._canvas) {
self._canvas.addEventListener('mousemove', function(e) {
var mousemove = function(e) {
e = e || window.event;
self.mousemove(e, self);
}, false);
};

self._canvas.addEventListener('mousedown', function(e) {
var mousedown = function(e) {
e = e || window.event;
self.mousedown(e, self);
}, false);
};

self._canvas.addEventListener('mouseup', function(e) {
var mouseup = function(e) {
e = e || window.event;
self.mouseup(e, self);
}, false);
};

self._canvas.addEventListener('mousemove', mousemove, false);
self._canvas.addEventListener('mousedown', mousedown, false);
self._canvas.addEventListener('mouseup', mouseup, false);

self._removals.push([self._canvas, 'mousemove', mousemove, false]);
self._removals.push([self._canvas, 'mousedown', mousedown, false]);
self._removals.push([self._canvas, 'mouseup', mouseup, false]);
}

// setup a global mouseup to blur the input outside of the canvas
Expand All @@ -122,6 +131,9 @@
window.addEventListener('mouseup', autoBlur, true);
window.addEventListener('touchend', autoBlur, true);

self._removals.push([window, 'mouseup', autoBlur, true]);
self._removals.push([window, 'touchend', autoBlur, true]);

// create the hidden input element
self._hiddenInput = document.createElement('input');
self._hiddenInput.type = 'text';
Expand Down Expand Up @@ -1208,6 +1220,14 @@
// remove the hidden input box
document.body.removeChild(self._hiddenInput);

// remove event listeners
var removals = self._removals;
for (var i=0; i<removals.length; i++) {
var removal = removals[i];
var obj = removal[0];
obj.removeEventListener.apply(obj, removal.slice(1));
}

// remove off-DOM canvas
self._renderCanvas = null;
self._shadowCanvas = null;
Expand Down