Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html

1 files changed, 13 insertions, 3 deletions

diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 452d09f1..20225c61 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -11,9 +11,19 @@ exports.ElementController = Montage.create(Component, {
 
     addElement: {
         value: function(el, styles) {
-            this.application.ninja.currentDocument.documentRoot.appendChild(el);
-            // Nested elements - TODO make sure the CSS is correct before nesting elements
-            // this.application.ninja.currentSelectedContainer.appendChild(el);
+            if(this.application.ninja.timeline.currentLayerSelected) {
+                var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID);
+
+                if(selectedLayerIndex === 0) {
+                    this.application.ninja.currentSelectedContainer.appendChild(el);
+                } else {
+                    var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.elementsList[0];
+                    element.parentNode.insertBefore(el, element.nextSibling);
+                }
+            } else {
+                this.application.ninja.currentSelectedContainer.appendChild(el);
+            }
+
             if(styles) {
                 this.application.ninja.stylesController.setElementStyles(el, styles);
             }