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/line-properties.reel/line-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/line-properties.reel/line-properties.js')
-rw-r--r-- | js/components/tools-properties/line-properties.reel/line-properties.js | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/js/components/tools-properties/line-properties.reel/line-properties.js b/js/components/tools-properties/line-properties.reel/line-properties.js index 694e4326..e1ecf790 100644 --- a/js/components/tools-properties/line-properties.reel/line-properties.js +++ b/js/components/tools-properties/line-properties.reel/line-properties.js | |||
@@ -33,18 +33,24 @@ exports.LineProperties = Montage.create(ToolProperties, { | |||
33 | }, | 33 | }, |
34 | 34 | ||
35 | strokeStyle : { | 35 | strokeStyle : { |
36 | get: function() { return this.base._strokeStyle.options[this.base._strokeStyle.value].text; } | 36 | get: function() { |
37 | // return this.base._strokeStyle.options[this.base._strokeStyle.value].text; | ||
38 | return "Solid"; | ||
39 | } | ||
37 | }, | 40 | }, |
38 | 41 | ||
39 | strokeStyleIndex : { | 42 | strokeStyleIndex : { |
40 | get: function() { return this.base._strokeStyle.options[this.base._strokeStyle.value].value; } | 43 | get: function() { |
44 | // return this.base._strokeStyle.options[this.base._strokeStyle.value].value; | ||
45 | return 1; | ||
46 | } | ||
41 | }, | 47 | }, |
42 | 48 | ||
43 | strokeMaterial: { | 49 | strokeMaterial: { |
44 | get: function() { return this.base._strokeMaterial.options[this.base._strokeMaterial.value].value; } | 50 | get: function() { return this.base._strokeMaterial.value; } |
45 | }, | 51 | }, |
46 | 52 | ||
47 | fillMaterial: { | 53 | fillMaterial: { |
48 | get: function() { return this.base._fillMaterial.options[this.base._fillMaterial.value].value; } | 54 | get: function() { return this.base._fillMaterial.value; } |
49 | } | 55 | } |
50 | }); \ No newline at end of file | 56 | }); \ No newline at end of file |