mirror of
https://github.com/scratchfoundation/paper.js.git
synced 2025-01-03 19:45:44 -05:00
Merge remote branch 'origin/master'
This commit is contained in:
commit
2c2d636198
1 changed files with 0 additions and 2 deletions
|
@ -382,7 +382,6 @@ var View = this.View = Base.extend({
|
||||||
}
|
}
|
||||||
|
|
||||||
function mousemove(event) {
|
function mousemove(event) {
|
||||||
DomEvent.stop(event);
|
|
||||||
if (!view || !(tool = view._scope.tool))
|
if (!view || !(tool = view._scope.tool))
|
||||||
return;
|
return;
|
||||||
// If the event was triggered by a touch screen device, prevent the
|
// If the event was triggered by a touch screen device, prevent the
|
||||||
|
@ -413,7 +412,6 @@ var View = this.View = Base.extend({
|
||||||
timer = clearInterval(timer);
|
timer = clearInterval(timer);
|
||||||
if (tool.onHandleEvent('mouseup', viewToArtwork(event), event))
|
if (tool.onHandleEvent('mouseup', viewToArtwork(event), event))
|
||||||
view.draw(true);
|
view.draw(true);
|
||||||
DomEvent.stop(event);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue