aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Color
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-03-09 16:00:17 -0800
committerNivesh Rajbhandari2012-03-09 16:00:17 -0800
commitf7bc2dc545765247e5139c0e7c92523747cb1362 (patch)
tree7b49092afbfb0825195724beb88b5559859b7fc1 /js/panels/Color
parenta782acfbbf2d1ac5630c2cae5affcc369ba99785 (diff)
parent69d90467865a1384725b2301901be2180c5a841f (diff)
downloadninja-f7bc2dc545765247e5139c0e7c92523747cb1362.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels/Color')
-rwxr-xr-xjs/panels/Color/colorpanelpopup.reel/colorpanelpopup.js13
1 files changed, 9 insertions, 4 deletions
diff --git a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
index 299e603d..3eae3ea3 100755
--- a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
+++ b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
@@ -379,11 +379,16 @@ exports.ColorPanelPopup = Montage.create(Component, {
379 gradient.element = container; 379 gradient.element = container;
380 gradient.hack = this.hack; // TODO: Remove 380 gradient.hack = this.hack; // TODO: Remove
381 // 381 //
382 if (g && g.value && g.value.stops && g.value.mode) { 382 if (g && g.value && g.value.stops) {
383 gradient._mode = g.value.mode; 383 if (g.value.gradientMode) {
384 gradient.value = g.value.stops; 384 gradient._mode = g.value.gradientMode;
385 gradient.value = g.value.stops;
386 } else {
387 gradient._mode = 'linear';
388 gradient.value = g.value.stops;
389 }
385 } else { 390 } else {
386 gradient._mode = this.defaultGradient.mode; 391 gradient._mode = this.defaultGradient.gradientMode;
387 gradient.value = this.defaultGradient.stops; 392 gradient.value = this.defaultGradient.stops;
388 } 393 }
389 // 394 //