lsm/konva
1
0
Fork 0
mirror of https://github.com/konvajs/konva.git synced 2025-11-18 17:17:49 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fixed stage drag and drop bug on tablets

Browse Source
This commit is contained in:
Eric Rowell
2012-06-03 12:48:13 -07:00
parent 8b22fb0690
commit e74fa3a319
7 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dist/kinetic-core.js vendored
View File

@@ -404,7 +404,7 @@ Kinetic.Node.prototype = {
/**
* bind events to the node. KineticJS supports mouseover, mousemove,
* mouseout, mousedown, mouseup, click, dblclick, touchstart, touchmove,
* touchend, dbltap, dragstart, dragmove, and dragend. Pass in a string
* touchend, tap, dbltap, dragstart, dragmove, and dragend. Pass in a string
* of event types delimmited by a space to bind multiple events at once
* such as 'mousedown mouseup mousemove'. include a namespace to bind an
* event by name such as 'click.foobar'.
@@ -1190,7 +1190,7 @@ Kinetic.Node.prototype = {
var go = Kinetic.GlobalObject;
var stage = this.getStage();
var pos = stage.getUserPosition();
if(pos) {
var m = this.getTransform().getTranslation();
var am = this.getAbsoluteTransform().getTranslation();
@@ -2107,15 +2107,13 @@ else if(!isDragging && this.touchMove) {
that.mouseDown = true;
that.mouseUp = false;
that.mouseMove = false;
that._handleStageEvent(evt);
/*
* init stage drag and drop
*/
if(that.attrs.draggable) {
that._initDrag();
}
that._handleStageEvent(evt);
}, false);
this.content.addEventListener('mousemove', function(evt) {
@@ -2163,15 +2161,13 @@ else if(!isDragging && this.touchMove) {
that.touchStart = true;
that.touchEnd = false;
that.touchMove = false;
that._handleStageEvent(evt);
/*
* init stage drag and drop
*/
if(that.attrs.draggable) {
that._initDrag();
}
that._handleStageEvent(evt);
}, false);
this.content.addEventListener('touchmove', function(evt) {
@@ -4596,7 +4592,6 @@ Kinetic.Transition = function(node, config) {
addTween(config, node.attrs);
var finishedTweens = 0;
var that = this;
for(var n = 0; n < this.tweens.length; n++) {
var tween = this.tweens[n];
tween.onFinished = function() {
@@ -4798,8 +4793,9 @@ Kinetic.Tween.prototype = {
continueTo: function(finish, duration) {
this.begin = this._pos;
this.setFinish(finish);
if(this._duration != undefined)
if(this._duration !== undefined) {
this.setDuration(duration);
}
this.start();
},
resume: function() {
@@ -4989,6 +4985,6 @@ Kinetic.Tweens = {
},
'linear': function(t, b, c, d) {
return c * t / d + b;
},
}
};

4
dist/kinetic-core.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
src/Node.js
View File

@@ -41,7 +41,7 @@ Kinetic.Node.prototype = {
/**
* bind events to the node. KineticJS supports mouseover, mousemove,
* mouseout, mousedown, mouseup, click, dblclick, touchstart, touchmove,
* touchend, dbltap, dragstart, dragmove, and dragend. Pass in a string
* touchend, tap, dbltap, dragstart, dragmove, and dragend. Pass in a string
* of event types delimmited by a space to bind multiple events at once
* such as 'mousedown mouseup mousemove'. include a namespace to bind an
* event by name such as 'click.foobar'.
@@ -827,7 +827,7 @@ Kinetic.Node.prototype = {
var go = Kinetic.GlobalObject;
var stage = this.getStage();
var pos = stage.getUserPosition();
if(pos) {
var m = this.getTransform().getTranslation();
var am = this.getAbsoluteTransform().getTranslation();

8
src/Stage.js
View File

@@ -624,15 +624,13 @@ else if(!isDragging && this.touchMove) {
that.mouseDown = true;
that.mouseUp = false;
that.mouseMove = false;
that._handleStageEvent(evt);
/*
* init stage drag and drop
*/
if(that.attrs.draggable) {
that._initDrag();
}
that._handleStageEvent(evt);
}, false);
this.content.addEventListener('mousemove', function(evt) {
@@ -680,15 +678,13 @@ else if(!isDragging && this.touchMove) {
that.touchStart = true;
that.touchEnd = false;
that.touchMove = false;
that._handleStageEvent(evt);
/*
* init stage drag and drop
*/
if(that.attrs.draggable) {
that._initDrag();
}
that._handleStageEvent(evt);
}, false);
this.content.addEventListener('touchmove', function(evt) {

6
src/util/Transition.js
View File

@@ -34,7 +34,6 @@ Kinetic.Transition = function(node, config) {
addTween(config, node.attrs);
var finishedTweens = 0;
var that = this;
for(var n = 0; n < this.tweens.length; n++) {
var tween = this.tweens[n];
tween.onFinished = function() {
@@ -236,8 +235,9 @@ Kinetic.Tween.prototype = {
continueTo: function(finish, duration) {
this.begin = this._pos;
this.setFinish(finish);
if(this._duration != undefined)
if(this._duration !== undefined) {
this.setDuration(duration);
}
this.start();
},
resume: function() {
@@ -427,5 +427,5 @@ Kinetic.Tweens = {
},
'linear': function(t, b, c, d) {
return c * t / d + b;
},
}
};

2
tests/js/Test.js
View File

@@ -17,7 +17,7 @@ function log(message) {
*/
function Test() {
//this.testOnly = 'EVENTS - mousedown mouseup mouseover mouseout mousemove click dblclick / touchstart touchend touchmove tap dbltap';
this.testOnly = '';
this.testOnly = 'DRAG AND DROP - drag and drop stage';
this.counter = 0;
testCounter = document.createElement('div');

4
tests/js/functionalTests.js
View File

@@ -1388,7 +1388,7 @@ Test.prototype.tests = {
width: 578,
height: 200,
draggable: true,
dragConstraint: 'horizontal',
//dragConstraint: 'horizontal',
/*
dragBounds: {
left: 100
@@ -1421,6 +1421,7 @@ Test.prototype.tests = {
//stage.draggable(false);
//layer.draggable(false);
/*
stage.on('dragstart', function() {
console.log('dragstart');
});
@@ -1430,6 +1431,7 @@ Test.prototype.tests = {
stage.on('dragend', function() {
console.log('dragend');
});
*/
layer.add(circle);
stage.add(layer);