Merge branch 'master' of github.com:ericdrowell/KineticJS

This commit is contained in:
Лаврёнов Антон
2014-03-01 20:16:27 +08:00
4 changed files with 13 additions and 46 deletions

View File

@@ -351,6 +351,7 @@
},
_mouseover: function(evt) {
if (!Kinetic.UA.mobile) {
this._setPointerPosition(evt);
this._fire(CONTENT_MOUSEOVER, evt);
}
},
@@ -369,7 +370,7 @@
this._fire(CONTENT_MOUSEOUT, evt);
}
},
_mousemove: Kinetic.Util._throttle(function(evt) {
_mousemove: function(evt) {
if (!Kinetic.UA.mobile) {
this._setPointerPosition(evt);
var dd = Kinetic.DD,
@@ -415,7 +416,7 @@
if (evt.preventDefault) {
evt.preventDefault();
}
}, 17),
},
_mousedown: function(evt) {
if (!Kinetic.UA.mobile) {
this._setPointerPosition(evt);
@@ -549,7 +550,7 @@
Kinetic.listenClickTap = false;
},
_touchmove: Kinetic.Util._throttle(function(evt) {
_touchmove: function(evt) {
this._setPointerPosition(evt);
var dd = Kinetic.DD,
shape = this.getIntersection(this.getPointerPosition());
@@ -568,7 +569,7 @@
if(dd) {
dd._drag(evt);
}
}, 17),
},
_setPointerPosition: function(evt) {
var contentPosition = this._getContentPosition(),
offsetX = evt.offsetX,