removed ^ from package.json file. Removed throttling support for mousemove and touchmove for now. It doesn't appear to have helped performance on Anton's device, so I don't want to leave it in if it's not making much of a difference. Anything that's async can be error prone, especially in combination with batch drawing

This commit is contained in:
Eric Rowell
2014-02-27 19:07:10 -08:00
parent 5cbb73a079
commit fbcc5814f2
2 changed files with 9 additions and 8 deletions

View File

@@ -16,10 +16,10 @@
"grunt": "0.4.2", "grunt": "0.4.2",
"connect": "2.13.0", "connect": "2.13.0",
"grunt-contrib-copy": "~0.5.0", "grunt-contrib-copy": "~0.5.0",
"grunt-shell": "^0.6.4", "jsdoc": "~3.3.0-alpha4",
"jsdoc": "^3.3.0-alpha4", "grunt-mocha-phantomjs": "~0.4.2",
"grunt-mocha-phantomjs": "^0.4.2", "grunt-contrib-watch": "~0.5.3",
"grunt-contrib-watch": "^0.5.3" "grunt-shell": "~0.6.4"
}, },
"readmeFilename": "README.md", "readmeFilename": "README.md",
"main": "kinetic.js", "main": "kinetic.js",

View File

@@ -347,6 +347,7 @@
}, },
_mouseover: function(evt) { _mouseover: function(evt) {
if (!Kinetic.UA.mobile) { if (!Kinetic.UA.mobile) {
this._setPointerPosition(evt);
this._fire(CONTENT_MOUSEOVER, evt); this._fire(CONTENT_MOUSEOVER, evt);
} }
}, },
@@ -365,7 +366,7 @@
this._fire(CONTENT_MOUSEOUT, evt); this._fire(CONTENT_MOUSEOUT, evt);
} }
}, },
_mousemove: Kinetic.Util._throttle(function(evt) { _mousemove: function(evt) {
if (!Kinetic.UA.mobile) { if (!Kinetic.UA.mobile) {
this._setPointerPosition(evt); this._setPointerPosition(evt);
var dd = Kinetic.DD, var dd = Kinetic.DD,
@@ -411,7 +412,7 @@
if (evt.preventDefault) { if (evt.preventDefault) {
evt.preventDefault(); evt.preventDefault();
} }
}, 17), },
_mousedown: function(evt) { _mousedown: function(evt) {
if (!Kinetic.UA.mobile) { if (!Kinetic.UA.mobile) {
this._setPointerPosition(evt); this._setPointerPosition(evt);
@@ -545,7 +546,7 @@
Kinetic.listenClickTap = false; Kinetic.listenClickTap = false;
}, },
_touchmove: Kinetic.Util._throttle(function(evt) { _touchmove: function(evt) {
this._setPointerPosition(evt); this._setPointerPosition(evt);
var dd = Kinetic.DD, var dd = Kinetic.DD,
shape = this.getIntersection(this.getPointerPosition()); shape = this.getIntersection(this.getPointerPosition());
@@ -564,7 +565,7 @@
if(dd) { if(dd) {
dd._drag(evt); dd._drag(evt);
} }
}, 17), },
_setPointerPosition: function(evt) { _setPointerPosition: function(evt) {
var contentPosition = this._getContentPosition(), var contentPosition = this._getContentPosition(),
offsetX = evt.offsetX, offsetX = evt.offsetX,