From 486842239c71e7964f38a09aacda4970f2a82e1a Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Tue, 7 Feb 2012 10:58:14 -0800 Subject: 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 --- .../rect-properties.reel/rect-properties.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'js/components/tools-properties/rect-properties.reel/rect-properties.js') 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 100644 --- 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, { }, strokeStyle : { - get: function() { return this.base._strokeStyle.options[this.base._strokeStyle.value].text; } + get: function() { +// return this.base._strokeStyle.options[this.base._strokeStyle.value].text; + return "Solid"; + } }, strokeStyleIndex : { - get: function() { return this.base._strokeStyle.options[this.base._strokeStyle.value].value; } + get: function() { +// return this.base._strokeStyle.options[this.base._strokeStyle.value].value; + return 1; + } }, strokeMaterial: { - get: function() { return this.base._strokeMaterial.options[this.base._strokeMaterial.value].value; } + get: function() { return this.base._strokeMaterial.value; } }, fillMaterial: { - get: function() { return this.base._fillMaterial.options[this.base._fillMaterial.value].value; } + get: function() { return this.base._fillMaterial.value; } }, _setBindings: { -- cgit v1.2.3