aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-07-09 11:43:36 -0700
committerNivesh Rajbhandari2012-07-09 11:43:36 -0700
commitac27d538af33ca8d67d3d88729f49c05793afda7 (patch)
tree4be9251ff087e93a37b1f463ae9eaaaf779caeeb /js/components
parenteff1851b2189bea8b89065980d02541cecea5ddf (diff)
downloadninja-ac27d538af33ca8d67d3d88729f49c05793afda7.tar.gz
PI, drawing and editing fixes for shapes and materials.
IKNinja-1841 - Cannot change webgl shape with LinearGradient and RadialGradient to solid color. IKNINJA-1851 - Cannot draw webgl shapes with Linear/RadialGradient material. IKNINJA-1864 - PI doesn't update the color of shape if WebGL material switches to Flat. IKNINJA-1886 - Gradient edits not applied to WebGL Stage object. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/components')
-rwxr-xr-xjs/components/ui/property-control.reel/property-control.js8
1 files changed, 7 insertions, 1 deletions
diff --git a/js/components/ui/property-control.reel/property-control.js b/js/components/ui/property-control.reel/property-control.js
index 20ec173e..cd684168 100755
--- a/js/components/ui/property-control.reel/property-control.js
+++ b/js/components/ui/property-control.reel/property-control.js
@@ -15,7 +15,8 @@ var Montage = require("montage/core/core").Montage,
15 TextField = require("js/components/TextField.reel").TextField, 15 TextField = require("js/components/TextField.reel").TextField,
16 ColorChip = require("js/components/ui/color-chip.reel").ColorChip, 16 ColorChip = require("js/components/ui/color-chip.reel").ColorChip,
17 FileInput = require("js/components/ui/file-input.reel").FileInput, 17 FileInput = require("js/components/ui/file-input.reel").FileInput,
18 InputGroup = require("js/components/ui/input-group.reel").InputGroup; 18 InputGroup = require("js/components/ui/input-group.reel").InputGroup,
19 GradientPicker = require("js/components/gradientpicker.reel").GradientPicker;
19 20
20var PropertyControl = exports.PropertyControl = Montage.create(Component, { 21var PropertyControl = exports.PropertyControl = Montage.create(Component, {
21 22
@@ -237,6 +238,11 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, {
237 this._control.addEventListener("changing", this, false); 238 this._control.addEventListener("changing", this, false);
238 this._prop = "value"; 239 this._prop = "value";
239 break; 240 break;
241 case "GradientPicker":
242 this._control = GradientPicker.create();
243 this._control.addEventListener("change", this, false);
244 this._prop = "value";
245 break;
240 default: 246 default:
241 break; 247 break;
242 } 248 }