scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-07 13:22:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Jürg Lehni 2011-05-14 16:00:47 +01:00
commit 53293ab8bd
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/tool/Tool.js
View file

@ -49,24 +49,24 @@ var Tool = this.Tool = ToolHandler.extend(new function() {
// If the event was triggered by a touch screen device, // If the event was triggered by a touch screen device,
// prevent the default behaviour, as it will otherwise // prevent the default behaviour, as it will otherwise
// scroll the page: // scroll the page:
var touchDevice = event && event.targetTouches; if (event && event.targetTouches) {
if (touchDevice) {
DomEvent.preventDefault(event); DomEvent.preventDefault(event);
} }
var point = event && viewToArtwork(event, that._document); var point = event && viewToArtwork(event, that._document);
// If there is only an onMouseMove handler, call it when
// the user is dragging
var onlyMove = !!(!that.onMouseDrag && that.onMouseMove); var onlyMove = !!(!that.onMouseDrag && that.onMouseMove);
if (dragging && !onlyMove) { if (dragging && !onlyMove) {
curPoint = point || curPoint; curPoint = point || curPoint;
if (curPoint) { if (curPoint) {
that.onHandleEvent('mousedrag', curPoint, event); that.onHandleEvent('mousedrag', curPoint, event);
} }
if (that.onMouseDrag)
that._document.redraw();
// PORT: If there is only an onMouseMove handler, also
// call it when the user is dragging:
} else if (!dragging || onlyMove) { } else if (!dragging || onlyMove) {
that.onHandleEvent('mousemove', point, event); that.onHandleEvent('mousemove', point, event);
} if (that.onMouseMove)
if (that.onMouseMove || touchDevice && that.onMouseDrag) { that._document.redraw();
that._document.redraw();
} }
}, },