From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Fri, 27 Jan 2012 12:05:17 -0800
Subject: Merged old FileIO

---
 js/controllers/elements/element-controller.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 js/controllers/elements/element-controller.js

(limited to 'js/controllers/elements/element-controller.js')

diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From f9d34a54baf61ccdf77732b1aaedb29d296b8c2e Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Mon, 20 Feb 2012 23:03:48 -0800
Subject: enabling nested selection

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/controllers/elements/element-controller.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'js/controllers/elements/element-controller.js')

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,
     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);
             this.application.ninja.stylesController.setElementStyles(el, styles);
         }
     },
-- 
cgit v1.2.3