diff options
author | Ananya Sen | 2012-02-08 15:37:23 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-08 15:37:23 -0800 |
commit | ab6f2f7ada39a9b27408575af9a565daf0a9d291 (patch) | |
tree | 92a796e34530d1a724ddb24ef22e59ffef13c12a /js/components/tools-properties/rect-properties.reel/rect-properties.js | |
parent | 36b2e540f06cef3887e7d0fea60527fee51e2a40 (diff) | |
parent | 5a69d5be181ea98fa842977885ebd8c861dda6ca (diff) | |
download | ninja-ab6f2f7ada39a9b27408575af9a565daf0a9d291.tar.gz |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Diffstat (limited to 'js/components/tools-properties/rect-properties.reel/rect-properties.js')
-rwxr-xr-x | 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 100755 --- 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: { |