From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- js/components/ui/property-control.reel/property-control.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'js/components/ui/property-control.reel/property-control.js') diff --git a/js/components/ui/property-control.reel/property-control.js b/js/components/ui/property-control.reel/property-control.js index 6e0a3916..834702fd 100755 --- a/js/components/ui/property-control.reel/property-control.js +++ b/js/components/ui/property-control.reel/property-control.js @@ -169,15 +169,15 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, { }, handleEvent: - { - value:function(event) - { + { + value:function(event) + { if(event.wasSetByCode) { return; } this._dispatchPropEvent(event); - } - }, + } + }, _dispatchPropEvent: { value: function(event) { -- cgit v1.2.3 From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:53:10 -0700 Subject: Remove trailing spaces --- js/components/ui/property-control.reel/property-control.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/components/ui/property-control.reel/property-control.js') diff --git a/js/components/ui/property-control.reel/property-control.js b/js/components/ui/property-control.reel/property-control.js index 834702fd..9b9c9482 100755 --- a/js/components/ui/property-control.reel/property-control.js +++ b/js/components/ui/property-control.reel/property-control.js @@ -195,7 +195,7 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, { propEvent.propertyLabel = this.label; propEvent.propertyValue = event.currentTarget[this._prop]; propEvent.propertyEvent = event; - + this.dispatchEvent(propEvent); } }, -- cgit v1.2.3 From ac27d538af33ca8d67d3d88729f49c05793afda7 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Mon, 9 Jul 2012 11:43:36 -0700 Subject: 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 --- js/components/ui/property-control.reel/property-control.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'js/components/ui/property-control.reel/property-control.js') 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, TextField = require("js/components/TextField.reel").TextField, ColorChip = require("js/components/ui/color-chip.reel").ColorChip, FileInput = require("js/components/ui/file-input.reel").FileInput, - InputGroup = require("js/components/ui/input-group.reel").InputGroup; + InputGroup = require("js/components/ui/input-group.reel").InputGroup, + GradientPicker = require("js/components/gradientpicker.reel").GradientPicker; var PropertyControl = exports.PropertyControl = Montage.create(Component, { @@ -237,6 +238,11 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, { this._control.addEventListener("changing", this, false); this._prop = "value"; break; + case "GradientPicker": + this._control = GradientPicker.create(); + this._control.addEventListener("change", this, false); + this._prop = "value"; + break; default: break; } -- cgit v1.2.3