aboutsummaryrefslogtreecommitdiff
path: root/js/document/html-document.js
diff options
context:
space:
mode:
authorEric Guzman2012-04-09 15:44:09 -0700
committerEric Guzman2012-04-09 15:44:09 -0700
commita27915e900eb768dd9db1f0dd441961ea80bfaa6 (patch)
tree593f429f0b3294103a059ae9f6ed03858288deb7 /js/document/html-document.js
parentafcaa157f7bc067cf00de91b43b2a71e9b64b7b3 (diff)
parentbd43ce383b050d03b0f92cc923c517febc66ca28 (diff)
downloadninja-a27915e900eb768dd9db1f0dd441961ea80bfaa6.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/document/html-document.js')
-rwxr-xr-xjs/document/html-document.js8
1 files changed, 0 insertions, 8 deletions
diff --git a/js/document/html-document.js b/js/document/html-document.js
index e96c9943..2531465d 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -300,19 +300,13 @@ 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.slice();
304 shapeModel.strokeMaterial = root._strikeMaterial ? root._strokeMaterial.dup() : null;
305 shapeModel.strokeStyle = "solid"; 303 shapeModel.strokeStyle = "solid";
306 //shapeModel.strokeStyleIndex 304 //shapeModel.strokeStyleIndex
307 //shapeModel.border
308 //shapeModel.background
309 switch (root.geomType()) 305 switch (root.geomType())
310 { 306 {
311 case root.GEOM_TYPE_RECTANGLE: 307 case root.GEOM_TYPE_RECTANGLE:
312 elementModel.selection = "Rectangle"; 308 elementModel.selection = "Rectangle";
313 elementModel.pi = "RectanglePi"; 309 elementModel.pi = "RectanglePi";
314 shapeModel.fill = root._fillColor.slice();
315 shapeModel.fillMaterial = root._fillMaterial ? root._fillMaterial.dup() : null;
316 shapeModel.tlRadius = root._tlRadius; 310 shapeModel.tlRadius = root._tlRadius;
317 shapeModel.trRadius = root._trRadius; 311 shapeModel.trRadius = root._trRadius;
318 shapeModel.blRadius = root._blRadius; 312 shapeModel.blRadius = root._blRadius;
@@ -322,8 +316,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
322 case root.GEOM_TYPE_CIRCLE: 316 case root.GEOM_TYPE_CIRCLE:
323 elementModel.selection = "Oval"; 317 elementModel.selection = "Oval";
324 elementModel.pi = "OvalPi"; 318 elementModel.pi = "OvalPi";
325 shapeModel.fill = root._fillColor.slice();
326 shapeModel.fillMaterial = root._fillMaterial ? root._fillMaterial.dup() : null;
327 shapeModel.innerRadius = root._innerRadius; 319 shapeModel.innerRadius = root._innerRadius;
328 break; 320 break;
329 321