Merge pull request #92 from amw/fix-move-down

Fix Layer.moveToBottom/moveDown when only one layer is present
This commit is contained in:
ericdrowell 2012-09-17 22:24:06 -07:00
commit 0bf3db0688
2 changed files with 21 additions and 9 deletions

16
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 26 2012 * Date: Sep 14 2012
* *
* Copyright (C) 2011 - 2012 by Eric Rowell * Copyright (C) 2011 - 2012 by Eric Rowell
* *
@ -1733,8 +1733,11 @@ Kinetic.Node.prototype = {
if(this.nodeType === 'Layer') { if(this.nodeType === 'Layer') {
var stage = this.getStage(); var stage = this.getStage();
if(stage) { if(stage) {
stage.content.removeChild(this.canvas.element); var children = stage.getChildren();
stage.content.insertBefore(this.canvas.element, stage.getChildren()[this.index + 1].canvas.element); if(children.length > 1) {
stage.content.removeChild(this.canvas.element);
stage.content.insertBefore(this.canvas.element, children[this.index + 1].canvas.element);
}
} }
} }
} }
@ -1753,8 +1756,11 @@ Kinetic.Node.prototype = {
if(this.nodeType === 'Layer') { if(this.nodeType === 'Layer') {
var stage = this.getStage(); var stage = this.getStage();
if(stage) { if(stage) {
stage.content.removeChild(this.canvas.element); var children = stage.getChildren();
stage.content.insertBefore(this.canvas.element, stage.getChildren()[1].canvas.element); if(children.length > 1) {
stage.content.removeChild(this.canvas.element);
stage.content.insertBefore(this.canvas.element, children[1].canvas.element);
}
} }
} }
}, },

View File

@ -577,8 +577,11 @@ Kinetic.Node.prototype = {
if(this.nodeType === 'Layer') { if(this.nodeType === 'Layer') {
var stage = this.getStage(); var stage = this.getStage();
if(stage) { if(stage) {
stage.content.removeChild(this.canvas.element); var children = stage.getChildren();
stage.content.insertBefore(this.canvas.element, stage.getChildren()[this.index + 1].canvas.element); if(children.length > 1) {
stage.content.removeChild(this.canvas.element);
stage.content.insertBefore(this.canvas.element, children[this.index + 1].canvas.element);
}
} }
} }
} }
@ -597,8 +600,11 @@ Kinetic.Node.prototype = {
if(this.nodeType === 'Layer') { if(this.nodeType === 'Layer') {
var stage = this.getStage(); var stage = this.getStage();
if(stage) { if(stage) {
stage.content.removeChild(this.canvas.element); var children = stage.getChildren();
stage.content.insertBefore(this.canvas.element, stage.getChildren()[1].canvas.element); if(children.length > 1) {
stage.content.removeChild(this.canvas.element);
stage.content.insertBefore(this.canvas.element, children[1].canvas.element);
}
} }
} }
}, },