diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/controllers/elements/element-controller.js | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/controllers/elements/element-controller.js')
-rwxr-xr-x | js/controllers/elements/element-controller.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js index 4a02e9a3..e40a646a 100755 --- a/js/controllers/elements/element-controller.js +++ b/js/controllers/elements/element-controller.js | |||
@@ -19,13 +19,13 @@ exports.ElementController = Montage.create(Component, { | |||
19 | var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID); | 19 | var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID); |
20 | 20 | ||
21 | if(selectedLayerIndex === 0) { | 21 | if(selectedLayerIndex === 0) { |
22 | this.application.ninja.currentSelectedContainer.appendChild(el); | 22 | this.application.ninja.currentDocument.model.domContainer.appendChild(el); |
23 | } else { | 23 | } else { |
24 | var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.elementsList[0]; | 24 | var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.elementsList[0]; |
25 | element.parentNode.insertBefore(el, element.nextSibling); | 25 | element.parentNode.insertBefore(el, element.nextSibling); |
26 | } | 26 | } |
27 | } else { | 27 | } else { |
28 | this.application.ninja.currentSelectedContainer.appendChild(el); | 28 | this.application.ninja.currentDocument.model.domContainer.appendChild(el); |
29 | } | 29 | } |
30 | 30 | ||
31 | if(styles) { | 31 | if(styles) { |