aboutsummaryrefslogtreecommitdiff
path: root/js/lib/NJUtils.js
diff options
context:
space:
mode:
authorEric Guzman2012-04-30 13:48:43 -0700
committerEric Guzman2012-04-30 13:48:43 -0700
commit23d8efd4ed9e8fd43f516595009679fb44c8096d (patch)
tree7d5be06e6417102702a49ece24fca82528aced7a /js/lib/NJUtils.js
parentae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/lib/NJUtils.js')
-rwxr-xr-xjs/lib/NJUtils.js14
1 files changed, 6 insertions, 8 deletions
diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index f6284b6c..f2785081 100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -96,10 +96,10 @@ exports.NJUtils = Object.create(Object.prototype, {
96 ///// TODO: find a different place for this function 96 ///// TODO: find a different place for this function
97 makeElementModel: { 97 makeElementModel: {
98 value: function(el, selection, controller, isShape) { 98 value: function(el, selection, controller, isShape) {
99 //el.elementModel = Montage.create(ElementModel).initialize(el.nodeName, selection, controller, isShape);
100
99 var p3d = Montage.create(Properties3D); 101 var p3d = Montage.create(Properties3D);
100 if(selection === "Stage") { 102
101 p3d.init(el, true);
102 }
103 var shapeProps = null; 103 var shapeProps = null;
104 var pi = controller + "Pi"; 104 var pi = controller + "Pi";
105 105
@@ -145,6 +145,7 @@ exports.NJUtils = Object.create(Object.prototype, {
145 isShape: { value: isShape} 145 isShape: { value: isShape}
146 }); 146 });
147 147
148
148 } 149 }
149 }, 150 },
150 151
@@ -169,15 +170,12 @@ exports.NJUtils = Object.create(Object.prototype, {
169 break; 170 break;
170 case "canvas": 171 case "canvas":
171 isShape = el.getAttribute("data-RDGE-id"); 172 isShape = el.getAttribute("data-RDGE-id");
172 if(isShape) 173 if(isShape) {
173 {
174 // TODO - Need more info about the shape 174 // TODO - Need more info about the shape
175 selection = "canvas"; 175 selection = "canvas";
176 controller = "shape"; 176 controller = "shape";
177 isShape = true; 177 isShape = true;
178 } 178 } else {
179 else
180 {
181 selection = "canvas"; 179 selection = "canvas";
182 controller = "canvas"; 180 controller = "canvas";
183 } 181 }