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/oval-properties.reel | |
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/oval-properties.reel')
-rwxr-xr-x | js/components/tools-properties/oval-properties.reel/oval-properties.js | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.js b/js/components/tools-properties/oval-properties.reel/oval-properties.js index c88f7799..ddeb64ee 100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.js +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.js | |||
@@ -33,19 +33,25 @@ exports.OvalProperties = 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 | 56 | ||
51 | 57 | ||