Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal into file-io

Conflicts:
	js/controllers/document-controller.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 1 insertions, 8 deletions

diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 95a72c89..51923f08 100755
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -28,13 +28,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
     // TODO use the specific controller to be able to subclass the functionality
     handleElementAdding: {
         value: function(event) {
-            /*
-            var cmd = ElementControllerCommands.addElementCommand(event.detail.el, event.detail.data);
-            NJevent("sendToUndo", cmd);
-            cmd.execute();
-            */
             this.addElement(event.detail.el, event.detail.data);
-
         }
     },
 
@@ -97,8 +91,7 @@ exports.ElementMediator = Montage.create(NJComponent, {
         value: function(el, rules, noEvent) {
             ElementController.addElement(el, rules);
             var p3d = this.get3DProperties(el);
-            if(p3d)
-            {
+            if(p3d) {
                 el.elementModel.controller["set3DProperties"](el, [p3d], 0, true);
             }
             if(!noEvent) {