diff options
author | Nivesh Rajbhandari | 2012-02-03 11:34:53 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-03 11:34:53 -0800 |
commit | 91de8f585e93d1a959c7fe56775df371ce6f50d6 (patch) | |
tree | 1621764c65cf2d0044e31e35b486e8409b31039f /js/models/shape-model.js | |
parent | c203ea7413b5a2b2232d7f8346cd1b9932f2575b (diff) | |
parent | 01efeff045e7196bab37fc60f7030969ad650d6c (diff) | |
download | ninja-91de8f585e93d1a959c7fe56775df371ce6f50d6.tar.gz |
Merge branch 'refs/heads/NiveshColor' into ToolFixes
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/models/shape-model.js')
-rw-r--r-- | js/models/shape-model.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/models/shape-model.js b/js/models/shape-model.js index 9d4fff6f..b643a7b5 100644 --- a/js/models/shape-model.js +++ b/js/models/shape-model.js | |||
@@ -20,10 +20,12 @@ exports.ShapeModel = Montage.create(Component, { | |||
20 | strokeMaterialIndex: { value: null }, | 20 | strokeMaterialIndex: { value: null }, |
21 | strokeStyle: { value: null }, | 21 | strokeStyle: { value: null }, |
22 | strokeStyleIndex: { value: null }, | 22 | strokeStyleIndex: { value: null }, |
23 | border: { value: null }, // Store css value for ColorController | ||
23 | 24 | ||
24 | fill: { value: null }, | 25 | fill: { value: null }, |
25 | fillMaterial: { value: null }, | 26 | fillMaterial: { value: null }, |
26 | fillMaterialIndex: { value: null }, | 27 | fillMaterialIndex: { value: null }, |
28 | background: { value: null }, // Store css value for ColorController | ||
27 | 29 | ||
28 | // Line-specific | 30 | // Line-specific |
29 | slope: { value: null }, | 31 | slope: { value: null }, |