diff options
author | Ananya Sen | 2012-04-17 18:11:55 -0700 |
---|---|---|
committer | Ananya Sen | 2012-04-17 18:11:55 -0700 |
commit | 35abad196cc9feb76ef50c1b63032a38233a6d51 (patch) | |
tree | 914689c66d4ab6c6e088b571eade0a0e35082916 /js/models/shape-model.js | |
parent | 1f891c58bad0b7746659aa4138001b5ee76d9a0e (diff) | |
parent | 616a8532099fec2a15855eac97cd85cb60c4451c (diff) | |
download | ninja-35abad196cc9feb76ef50c1b63032a38233a6d51.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/models/shape-model.js')
-rwxr-xr-x | js/models/shape-model.js | 7 |
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 }, |