Skip to content

Commit

Permalink
Support Firefox
Browse files Browse the repository at this point in the history
  • Loading branch information
jes committed May 26, 2013
1 parent 3ebeb05 commit 1c21b5c
Showing 1 changed file with 22 additions and 15 deletions.
37 changes: 22 additions & 15 deletions public/static/js/add-faces.js
Expand Up @@ -36,14 +36,14 @@ $('#clear-button').click(function() {
clear_canvas();
});

$('#faces-canvas').mousedown(function() {
start_drag();
$('#faces-canvas').mousedown(function(e) {
return start_drag(e);
});
$('#faces-canvas').mousemove(function() {
update_drag();
$('#faces-canvas').mousemove(function(e) {
return update_drag(e);
});
$('#faces-canvas').mouseup(function() {
end_drag();
$('#faces-canvas').mouseup(function(e) {
return end_drag(e);
});

function rerender() {
Expand Down Expand Up @@ -115,28 +115,33 @@ var in_drag;
var startdragx, startdragy;
var enddragx, enddragy;

function start_drag() {
window.event.preventDefault();
function start_drag(e) {
if (e == undefined)
return;

in_drag = true;

startdragx = enddragx = window.event.clientX - canvas.getBoundingClientRect().left;
startdragy = enddragy = window.event.clientY - canvas.getBoundingClientRect().top;
startdragx = enddragx = e.clientX - canvas.getBoundingClientRect().left;
startdragy = enddragy = e.clientY - canvas.getBoundingClientRect().top;

rerender();

return false;
}

function update_drag() {
if (!in_drag)
function update_drag(e) {
if (e == undefined || !in_drag)
return;

enddragx = window.event.clientX - canvas.getBoundingClientRect().left;
enddragy = window.event.clientY - canvas.getBoundingClientRect().top;
enddragx = e.clientX - canvas.getBoundingClientRect().left;
enddragy = e.clientY - canvas.getBoundingClientRect().top;

rerender();

return false;
}

function end_drag() {
function end_drag(e) {
if (!in_drag)
return;

Expand All @@ -149,4 +154,6 @@ function end_drag() {
faces.push([startdragx, startdragy, d]);

rerender();

return false;
}

0 comments on commit 1c21b5c

Please sign in to comment.