diff options
author | Nivesh Rajbhandari | 2012-02-07 10:58:14 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-07 10:58:14 -0800 |
commit | 486842239c71e7964f38a09aacda4970f2a82e1a (patch) | |
tree | 20a6688d296b1ef09bf32add9dfdef586bfe4207 /js/components/tools-properties/rect-properties.reel/rect-properties.js | |
parent | 789eaf5a92c903f27462c69a8890fbec695ab14e (diff) | |
download | ninja-486842239c71e7964f38a09aacda4970f2a82e1a.tar.gz |
Updated tools and PI to get/set materials by binding to appModel's materials property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/components/tools-properties/rect-properties.reel/rect-properties.js')
-rw-r--r-- | js/components/tools-properties/rect-properties.reel/rect-properties.js | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.js b/js/components/tools-properties/rect-properties.reel/rect-properties.js index 1e717f88..b2de6ff7 100644 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.js +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.js | |||
@@ -55,19 +55,25 @@ exports.RectProperties = Montage.create(ToolProperties, { | |||
55 | }, | 55 | }, |
56 | 56 | ||
57 | strokeStyle : { | 57 | strokeStyle : { |
58 | get: function() { return this.base._strokeStyle.options[this.base._strokeStyle.value].text; } | 58 | get: function() { |
59 | // return this.base._strokeStyle.options[this.base._strokeStyle.value].text; | ||
60 | return "Solid"; | ||
61 | } | ||
59 | }, | 62 | }, |
60 | 63 | ||
61 | strokeStyleIndex : { | 64 | strokeStyleIndex : { |
62 | get: function() { return this.base._strokeStyle.options[this.base._strokeStyle.value].value; } | 65 | get: function() { |
66 | // return this.base._strokeStyle.options[this.base._strokeStyle.value].value; | ||
67 | return 1; | ||
68 | } | ||
63 | }, | 69 | }, |
64 | 70 | ||
65 | strokeMaterial: { | 71 | strokeMaterial: { |
66 | get: function() { return this.base._strokeMaterial.options[this.base._strokeMaterial.value].value; } | 72 | get: function() { return this.base._strokeMaterial.value; } |
67 | }, | 73 | }, |
68 | 74 | ||
69 | fillMaterial: { | 75 | fillMaterial: { |
70 | get: function() { return this.base._fillMaterial.options[this.base._fillMaterial.value].value; } | 76 | get: function() { return this.base._fillMaterial.value; } |
71 | }, | 77 | }, |
72 | 78 | ||
73 | _setBindings: { | 79 | _setBindings: { |