diff options
| author | Nivesh Rajbhandari | 2012-03-09 16:00:17 -0800 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-03-09 16:00:17 -0800 |
| commit | f7bc2dc545765247e5139c0e7c92523747cb1362 (patch) | |
| tree | 7b49092afbfb0825195724beb88b5559859b7fc1 /js/components | |
| parent | a782acfbbf2d1ac5630c2cae5affcc369ba99785 (diff) | |
| parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
| download | ninja-f7bc2dc545765247e5139c0e7c92523747cb1362.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/components')
| -rwxr-xr-x | js/components/gradientpicker.reel/gradientpicker.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/components/gradientpicker.reel/gradientpicker.js b/js/components/gradientpicker.reel/gradientpicker.js index cedeef50..da4e8c0f 100755 --- a/js/components/gradientpicker.reel/gradientpicker.js +++ b/js/components/gradientpicker.reel/gradientpicker.js | |||
| @@ -397,7 +397,6 @@ exports.GradientPicker = Montage.create(Component, { | |||
| 397 | actionEvent.initEvent(type, true, true); | 397 | actionEvent.initEvent(type, true, true); |
| 398 | actionEvent.type = type; | 398 | actionEvent.type = type; |
| 399 | actionEvent.wasSetByCode = userInitiated; | 399 | actionEvent.wasSetByCode = userInitiated; |
| 400 | // TODO - mode seems to get reset to "rgb", so also setting a gradientMode property | ||
| 401 | actionEvent.gradient = {stops: this.value, mode: this.mode, gradientMode: this.mode, css: css}; | 400 | actionEvent.gradient = {stops: this.value, mode: this.mode, gradientMode: this.mode, css: css}; |
| 402 | this.dispatchEvent(actionEvent); | 401 | this.dispatchEvent(actionEvent); |
| 403 | } | 402 | } |