diff options
author | Nivesh Rajbhandari | 2012-04-05 12:12:36 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-05 12:12:36 -0700 |
commit | 4dc89306c43e86cdac254c81fb9bb3a92eb4a8b9 (patch) | |
tree | 9fc9a25696ddaeb1781865ec535b6c65ac985e89 /js/document | |
parent | 1e2e0a8d04e55c0ecfb0b1b674792b69fb091415 (diff) | |
download | ninja-4dc89306c43e86cdac254c81fb9bb3a92eb4a8b9.tar.gz |
Removing fill, stroke, fillMaterial and strokeMaterial from the shapeModel cache because they can easily get out of sync with the actual colors and materials. Instead, we will always query the object for these values.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/document')
-rwxr-xr-x | js/document/html-document.js | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js index 6324d5ed..2531465d 100755 --- a/js/document/html-document.js +++ b/js/document/html-document.js | |||
@@ -300,7 +300,6 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
300 | { | 300 | { |
301 | shapeModel.GLGeomObj = root; | 301 | shapeModel.GLGeomObj = root; |
302 | shapeModel.strokeSize = root._strokeWidth; | 302 | shapeModel.strokeSize = root._strokeWidth; |
303 | shapeModel.stroke = root._strokeColor; | ||
304 | shapeModel.strokeStyle = "solid"; | 303 | shapeModel.strokeStyle = "solid"; |
305 | //shapeModel.strokeStyleIndex | 304 | //shapeModel.strokeStyleIndex |
306 | switch (root.geomType()) | 305 | switch (root.geomType()) |
@@ -308,7 +307,6 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
308 | case root.GEOM_TYPE_RECTANGLE: | 307 | case root.GEOM_TYPE_RECTANGLE: |
309 | elementModel.selection = "Rectangle"; | 308 | elementModel.selection = "Rectangle"; |
310 | elementModel.pi = "RectanglePi"; | 309 | elementModel.pi = "RectanglePi"; |
311 | shapeModel.fill = root._fillColor; | ||
312 | shapeModel.tlRadius = root._tlRadius; | 310 | shapeModel.tlRadius = root._tlRadius; |
313 | shapeModel.trRadius = root._trRadius; | 311 | shapeModel.trRadius = root._trRadius; |
314 | shapeModel.blRadius = root._blRadius; | 312 | shapeModel.blRadius = root._blRadius; |
@@ -318,7 +316,6 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
318 | case root.GEOM_TYPE_CIRCLE: | 316 | case root.GEOM_TYPE_CIRCLE: |
319 | elementModel.selection = "Oval"; | 317 | elementModel.selection = "Oval"; |
320 | elementModel.pi = "OvalPi"; | 318 | elementModel.pi = "OvalPi"; |
321 | shapeModel.fill = root._fillColor; | ||
322 | shapeModel.innerRadius = root._innerRadius; | 319 | shapeModel.innerRadius = root._innerRadius; |
323 | break; | 320 | break; |
324 | 321 | ||