aboutsummaryrefslogtreecommitdiff
path: root/js/models/shape-model.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-04-10 11:24:21 -0700
committerJose Antonio Marquez2012-04-10 11:24:21 -0700
commitd14f78b06d37aa469885f2ecf84419bcb7e3e613 (patch)
tree91b95c6c9aef779a743b710105546a8ae74bff12 /js/models/shape-model.js
parenta9bcc403df76ad2cb7c31ff7fdd42a85c35cf424 (diff)
parentbd43ce383b050d03b0f92cc923c517febc66ca28 (diff)
downloadninja-d14f78b06d37aa469885f2ecf84419bcb7e3e613.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/models/shape-model.js')
-rwxr-xr-xjs/models/shape-model.js7
1 files changed, 0 insertions, 7 deletions
diff --git a/js/models/shape-model.js b/js/models/shape-model.js
index ea8c2cfc..ff69ae3c 100755
--- a/js/models/shape-model.js
+++ b/js/models/shape-model.js
@@ -17,15 +17,8 @@ exports.ShapeModel = Montage.create(Component, {
17 GLGeomObj: { value: null }, 17 GLGeomObj: { value: null },
18 18
19 strokeSize: { value: null }, 19 strokeSize: { value: null },
20 stroke: { value: null },
21 strokeMaterial: { value: null },
22 strokeStyle: { value: null }, 20 strokeStyle: { value: null },
23 strokeStyleIndex: { value: null }, 21 strokeStyleIndex: { value: null },
24 border: { value: null }, // Store css value for ColorController
25
26 fill: { value: null },
27 fillMaterial: { value: null },
28 background: { value: null }, // Store css value for ColorController
29 22
30 // Line-specific 23 // Line-specific
31 slope: { value: null }, 24 slope: { value: null },