diff options
author | Jose Antonio Marquez | 2012-05-03 15:32:03 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-03 15:32:03 -0700 |
commit | ad70905eaa725c7c5638436da1306ccea30e343c (patch) | |
tree | 5233e824a78589b8ff4ed072929dfe0ca3d73d6a /js/controllers/elements/element-controller.js | |
parent | 6356edefaea3fe78969c53fec2d371cb8f42d820 (diff) | |
parent | 602240c38e0f2c3937d3c7246247e0b59bccab2b (diff) | |
download | ninja-ad70905eaa725c7c5638436da1306ccea30e343c.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/controllers/elements/element-controller.js')
-rwxr-xr-x | js/controllers/elements/element-controller.js | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js index 452d09f1..ea5fe4af 100755 --- a/js/controllers/elements/element-controller.js +++ b/js/controllers/elements/element-controller.js | |||
@@ -11,7 +11,18 @@ exports.ElementController = Montage.create(Component, { | |||
11 | 11 | ||
12 | addElement: { | 12 | addElement: { |
13 | value: function(el, styles) { | 13 | value: function(el, styles) { |
14 | this.application.ninja.currentDocument.documentRoot.appendChild(el); | 14 | if(this.application.ninja.timeline.currentLayerSelected) { |
15 | var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID); | ||
16 | |||
17 | if(selectedLayerIndex === 0) { | ||
18 | this.application.ninja.currentDocument.documentRoot.appendChild(el); | ||
19 | } else { | ||
20 | var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.elementsList[0]; | ||
21 | element.parentNode.insertBefore(el, element.nextSibling); | ||
22 | } | ||
23 | } else { | ||
24 | this.application.ninja.currentDocument.documentRoot.appendChild(el); | ||
25 | } | ||
15 | // Nested elements - TODO make sure the CSS is correct before nesting elements | 26 | // Nested elements - TODO make sure the CSS is correct before nesting elements |
16 | // this.application.ninja.currentSelectedContainer.appendChild(el); | 27 | // this.application.ninja.currentSelectedContainer.appendChild(el); |
17 | if(styles) { | 28 | if(styles) { |