diff options
author | Valerio Virgillito | 2012-04-27 14:21:35 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-27 14:21:35 -0700 |
commit | b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8 (patch) | |
tree | ae45391131c7c5203ae8e0d3470d106d835c8c6b /js/lib | |
parent | 314709dd189807bfc762aa150bb1b29d2ccdf25b (diff) | |
parent | 6c1aa27b7753bc9007514859b42160fae265740d (diff) | |
download | ninja-b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8.tar.gz |
Merge branch 'refs/heads/serialization'
Diffstat (limited to 'js/lib')
-rwxr-xr-x | js/lib/NJUtils.js | 14 |
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, { | |||
94 | ///// TODO: find a different place for this function | 94 | ///// TODO: find a different place for this function |
95 | makeElementModel: { | 95 | makeElementModel: { |
96 | value: function(el, selection, controller, isShape) { | 96 | value: function(el, selection, controller, isShape) { |
97 | //el.elementModel = Montage.create(ElementModel).initialize(el.nodeName, selection, controller, isShape); | ||
98 | |||
97 | var p3d = Montage.create(Properties3D); | 99 | var p3d = Montage.create(Properties3D); |
98 | if(selection === "Stage") { | 100 | |
99 | p3d.init(el, true); | ||
100 | } | ||
101 | var shapeProps = null; | 101 | var shapeProps = null; |
102 | var pi = controller + "Pi"; | 102 | var pi = controller + "Pi"; |
103 | 103 | ||
@@ -143,6 +143,7 @@ exports.NJUtils = Object.create(Object.prototype, { | |||
143 | isShape: { value: isShape} | 143 | isShape: { value: isShape} |
144 | }); | 144 | }); |
145 | 145 | ||
146 | |||
146 | } | 147 | } |
147 | }, | 148 | }, |
148 | 149 | ||
@@ -167,15 +168,12 @@ exports.NJUtils = Object.create(Object.prototype, { | |||
167 | break; | 168 | break; |
168 | case "canvas": | 169 | case "canvas": |
169 | isShape = el.getAttribute("data-RDGE-id"); | 170 | isShape = el.getAttribute("data-RDGE-id"); |
170 | if(isShape) | 171 | if(isShape) { |
171 | { | ||
172 | // TODO - Need more info about the shape | 172 | // TODO - Need more info about the shape |
173 | selection = "canvas"; | 173 | selection = "canvas"; |
174 | controller = "shape"; | 174 | controller = "shape"; |
175 | isShape = true; | 175 | isShape = true; |
176 | } | 176 | } else { |
177 | else | ||
178 | { | ||
179 | selection = "canvas"; | 177 | selection = "canvas"; |
180 | controller = "canvas"; | 178 | controller = "canvas"; |
181 | } | 179 | } |