diff options
author | Jose Antonio Marquez | 2012-02-08 13:14:29 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-08 13:14:29 -0800 |
commit | 9b45b897949bf934c8bf2c90ee2ff78f8713cb12 (patch) | |
tree | e7c276a3934c823cab894f46ee7dc5d3eda9ca83 /js/components/tools-properties/oval-properties.reel/oval-properties.js | |
parent | aa01c1210f3a4d9fd55a771b9de2c58ee3fa4bb6 (diff) | |
parent | 10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (diff) | |
download | ninja-9b45b897949bf934c8bf2c90ee2ff78f8713cb12.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
Diffstat (limited to 'js/components/tools-properties/oval-properties.reel/oval-properties.js')
-rw-r--r-- | 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 100644 --- 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 | ||