aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements
diff options
context:
space:
mode:
authorEric Guzman2012-02-22 23:19:45 -0800
committerEric Guzman2012-02-22 23:19:45 -0800
commit9e8cd4448a6d0f809a55c3bdea8b45ed75339794 (patch)
treec7b5105153f17aedecd0669c611dbea44be7374c /js/controllers/elements
parenta5ee11857f923d3e49b44c0a8c480e9d0b026d5b (diff)
parent2afef244a3f8124f8a049e504e9782c05904ce23 (diff)
downloadninja-9e8cd4448a6d0f809a55c3bdea8b45ed75339794.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/controllers/elements')
-rwxr-xr-xjs/controllers/elements/element-controller.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 65d26bdd..ac14def4 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -12,6 +12,9 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
12 addElement: { 12 addElement: {
13 value: function(el, styles) { 13 value: function(el, styles) {
14 this.application.ninja.currentDocument.documentRoot.appendChild(el); 14 this.application.ninja.currentDocument.documentRoot.appendChild(el);
15 // Nested elements -
16 // TODO make sure the CSS is correct before nesting elements
17 // this.application.ninja.currentSelectedContainer.appendChild(el);
15 this.application.ninja.stylesController.setElementStyles(el, styles); 18 this.application.ninja.stylesController.setElementStyles(el, styles);
16 } 19 }
17 }, 20 },