(Forgot to build the dist-versions.)

This commit is contained in:
David Johansson
2012-08-14 22:03:53 +02:00
parent d354117409
commit 7530e6a098
2 changed files with 9 additions and 10 deletions

15
dist/kinetic-core.js vendored
View File

@@ -3,7 +3,7 @@
* http://www.kineticjs.com/ * http://www.kineticjs.com/
* Copyright 2012, Eric Rowell * Copyright 2012, Eric Rowell
* Licensed under the MIT or GPL Version 2 licenses. * Licensed under the MIT or GPL Version 2 licenses.
* Date: Aug 13 2012 * Date: Aug 14 2012
* *
* Copyright (C) 2011 - 2012 by Eric Rowell * Copyright (C) 2011 - 2012 by Eric Rowell
* *
@@ -3510,8 +3510,8 @@ Kinetic.Stage = Kinetic.Container.extend({
if(node) { if(node) {
var pos = that.getUserPosition(); var pos = that.getUserPosition();
var db = node.attrs.dragBounds;
var dbf = node.attrs.dragBoundFunc; var dbf = node.attrs.dragBoundFunc;
var db = node.attrs.dragBounds;
var dc = node.attrs.dragConstraint; var dc = node.attrs.dragConstraint;
var lastNodePos = { var lastNodePos = {
x: node.attrs.x, x: node.attrs.x,
@@ -3524,6 +3524,11 @@ Kinetic.Stage = Kinetic.Container.extend({
y: pos.y - go.drag.offset.y y: pos.y - go.drag.offset.y
}; };
if(dbf !== undefined) {
// execute nodes dragBoundFunc if defined
newNodePos = dbf.call(node, newNodePos, evt);
}
// bounds overrides // bounds overrides
if(db.left !== undefined && newNodePos.x < db.left) { if(db.left !== undefined && newNodePos.x < db.left) {
newNodePos.x = db.left; newNodePos.x = db.left;
@@ -3538,11 +3543,6 @@ Kinetic.Stage = Kinetic.Container.extend({
newNodePos.y = db.bottom; newNodePos.y = db.bottom;
} }
if(dbf !== undefined) {
// execute dragBoundFunc if defined
newNodePos = dbf.call(node, newNodePos, evt);
}
// constraint overrides // constraint overrides
if(dc === 'horizontal') { if(dc === 'horizontal') {
newNodePos.y = lastNodePos.y; newNodePos.y = lastNodePos.y;
@@ -3551,7 +3551,6 @@ Kinetic.Stage = Kinetic.Container.extend({
newNodePos.x = lastNodePos.x; newNodePos.x = lastNodePos.x;
} }
node.setAbsolutePosition(newNodePos); node.setAbsolutePosition(newNodePos);
if(!go.drag.moving) { if(!go.drag.moving) {

File diff suppressed because one or more lines are too long