aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/line-properties.reel/line-properties.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-08 22:15:41 -0800
committerValerio Virgillito2012-02-08 22:15:41 -0800
commitc7df002135328edac03e72a1e4b331b2c72667f8 (patch)
treeee50509df494b069d1769b7b54afd83fd0178e64 /js/components/tools-properties/line-properties.reel/line-properties.js
parent725c54ff4af40f70b7dbd4508da34d2909cea8bd (diff)
parent35ad4d6d2fac4432046141c63c0209cf3d00be5c (diff)
downloadninja-c7df002135328edac03e72a1e4b331b2c72667f8.tar.gz
Merge branch 'refs/heads/master' into components
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.js14
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