diff options
author | Jose Antonio Marquez | 2012-05-07 10:38:04 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-07 10:38:04 -0700 |
commit | 5293ede5f3493900df93da33197416d853f8d907 (patch) | |
tree | 3155deaea5616fa09fc96c84567419fec5f288a2 /js/controllers/elements/element-controller.js | |
parent | 9c0bda09a502472768f6dd5090a882d11be58d23 (diff) | |
parent | 30e837ade2da7cb20caf7c5a69faf0888736bb9a (diff) | |
download | ninja-5293ede5f3493900df93da33197416d853f8d907.tar.gz |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/controllers/elements/element-controller.js')
-rwxr-xr-x | js/controllers/elements/element-controller.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js index ea5fe4af..20225c61 100755 --- a/js/controllers/elements/element-controller.js +++ b/js/controllers/elements/element-controller.js | |||
@@ -15,16 +15,15 @@ exports.ElementController = Montage.create(Component, { | |||
15 | var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID); | 15 | var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID); |
16 | 16 | ||
17 | if(selectedLayerIndex === 0) { | 17 | if(selectedLayerIndex === 0) { |
18 | this.application.ninja.currentDocument.documentRoot.appendChild(el); | 18 | this.application.ninja.currentSelectedContainer.appendChild(el); |
19 | } else { | 19 | } else { |
20 | var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.elementsList[0]; | 20 | var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.elementsList[0]; |
21 | element.parentNode.insertBefore(el, element.nextSibling); | 21 | element.parentNode.insertBefore(el, element.nextSibling); |
22 | } | 22 | } |
23 | } else { | 23 | } else { |
24 | this.application.ninja.currentDocument.documentRoot.appendChild(el); | 24 | this.application.ninja.currentSelectedContainer.appendChild(el); |
25 | } | 25 | } |
26 | // Nested elements - TODO make sure the CSS is correct before nesting elements | 26 | |
27 | // this.application.ninja.currentSelectedContainer.appendChild(el); | ||
28 | if(styles) { | 27 | if(styles) { |
29 | this.application.ninja.stylesController.setElementStyles(el, styles); | 28 | this.application.ninja.stylesController.setElementStyles(el, styles); |
30 | } | 29 | } |