Skip to content

Commit

Permalink
Merge remote branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
mourner committed May 30, 2011
2 parents 876bb4f + 577fc5d commit 8c3f146
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/dom/Draggable.js
Expand Up @@ -31,9 +31,7 @@ L.Draggable = L.Class.extend({
_onDown: function(e) {
if (e.shiftKey || ((e.which != 1) && (e.button != 1) && !e.touches)) { return; }

if (!e.touches) {
L.DomEvent.preventDefault(e);
}
L.DomEvent.preventDefault(e);
if (e.touches && e.touches.length > 1) { return; }
if (e.touches && e.touches.length == 1) { e = e.touches[0]; }

Expand Down Expand Up @@ -98,4 +96,4 @@ L.Draggable = L.Class.extend({
_restoreCursor: function() {
document.body.style.cursor = this._bodyCursor;
}
});
});

0 comments on commit 8c3f146

Please sign in to comment.