diff options
author | Jon Reid | 2012-04-10 14:52:23 -0700 |
---|---|---|
committer | Jon Reid | 2012-04-10 14:52:23 -0700 |
commit | c19987997758cf47ac9b93a2a767a0e2a9072745 (patch) | |
tree | eb68491c5d04a5cf5ab75bedf2d6bbed3c7a3603 /js/document/html-document.js | |
parent | 03a3b32b9b0fd2dc8e4b54bfd5282fd1f8fb6ed6 (diff) | |
parent | 422b14fc60be84c116115f2e71e3499e232f3f05 (diff) | |
download | ninja-c19987997758cf47ac9b93a2a767a0e2a9072745.tar.gz |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/document/html-document.js')
-rwxr-xr-x | js/document/html-document.js | 8 |
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 | ||