Skip to content

Commit

Permalink
Make sure to cancel the default action for camera controls.
Browse files Browse the repository at this point in the history
From reading http://www.quirksmode.org/js/dragdrop.html, returning false will
only work in Internet Explorer.  We'll just assume we're in a W3C compliant
browser and call preventDefault(), but we return false additionally anyway.

Thanks to Mr. Doob for the report and suggestion.
  • Loading branch information
deanm committed Jun 12, 2010
1 parent cde4fa8 commit b06d9d0
Showing 1 changed file with 24 additions and 12 deletions.
36 changes: 24 additions & 12 deletions demos/demo_utils.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -119,14 +119,23 @@ DemoUtils = (function() {
state.is_clicking = true; state.is_clicking = true;
state.last_x = rel.x; state.last_x = rel.x;
state.last_y = rel.y state.last_y = rel.y
// Event was handled, don't take default action.
e.preventDefault();
return false;
}, false); }, false);


canvas.addEventListener('mouseup', function(e) { canvas.addEventListener('mouseup', function(e) {
state.is_clicking = false; state.is_clicking = false;
// Event was handled, don't take default action.
e.preventDefault();
return false;
}, false); }, false);


canvas.addEventListener('mouseout', function(e) { canvas.addEventListener('mouseout', function(e) {
state.is_clicking = false; state.is_clicking = false;
// Event was handled, don't take default action.
e.preventDefault();
return false;
}, false); }, false);


canvas.addEventListener('mousemove', function(e) { canvas.addEventListener('mousemove', function(e) {
Expand All @@ -142,20 +151,23 @@ DemoUtils = (function() {
// We need one event to get calibrated. // We need one event to get calibrated.
if (state.first_event) { if (state.first_event) {
state.first_event = false; state.first_event = false;
return; } else {
var info = {
is_clicking: state.is_clicking,
canvas_x: state.last_x,
canvas_y: state.last_y,
delta_x: delta_x,
delta_y: delta_y,
shift: e.shiftKey,
ctrl: e.ctrlKey
};

listener(info);
} }


var info = { // Event was handled, don't take default action.
is_clicking: state.is_clicking, e.preventDefault();
canvas_x: state.last_x, return false;
canvas_y: state.last_y,
delta_x: delta_x,
delta_y: delta_y,
shift: e.shiftKey,
ctrl: e.ctrlKey
};

listener(info);
}, false); }, false);
} }


Expand Down

0 comments on commit b06d9d0

Please sign in to comment.