aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Color
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-03-09 15:48:47 -0800
committerJose Antonio Marquez2012-03-09 15:48:47 -0800
commit746efec94176c834cbc899d1c88381ff850ffab7 (patch)
tree6c8569fcd2c9e2dfa4897b84786577fd6e3c4768 /js/panels/Color
parent9ddda5c8c0cea3c278ad4dc4ba358543f896332c (diff)
parent3426b14a294810ff30c0e65a3f7bfee930382400 (diff)
downloadninja-746efec94176c834cbc899d1c88381ff850ffab7.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO-Build-Candidate
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 //