Merge branch 'master' into pentool

1 files changed, 6 insertions, 8 deletions

diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index 67bb59c4..dae128e4 100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -94,10 +94,10 @@ exports.NJUtils = Object.create(Object.prototype, {
     ///// TODO: find a different place for this function
     makeElementModel: {
         value: function(el, selection, controller, isShape) {
+            //el.elementModel = Montage.create(ElementModel).initialize(el.nodeName, selection, controller, isShape);
+
             var p3d = Montage.create(Properties3D);
-            if(selection === "Stage") {
-                p3d.init(el, true);
-            }
+
             var shapeProps = null;
             var pi = controller + "Pi";
 
@@ -143,6 +143,7 @@ exports.NJUtils = Object.create(Object.prototype, {
                     isShape:    { value: isShape}
             });
 
+
         }
     },
 
@@ -167,15 +168,12 @@ exports.NJUtils = Object.create(Object.prototype, {
                     break;
                 case "canvas":
                     isShape = el.getAttribute("data-RDGE-id");
-                    if(isShape)
-                    {
+                    if(isShape) {
                         // TODO - Need more info about the shape
                         selection = "canvas";
                         controller = "shape";
                         isShape = true;
-                    }
-                    else
-                    {
+                    } else {
                         selection = "canvas";
                         controller = "canvas";
                     }