diff options
author | hwc487 | 2012-03-09 15:55:19 -0800 |
---|---|---|
committer | hwc487 | 2012-03-09 15:55:19 -0800 |
commit | 124c1e0e4bf7a0523e641ee37352128690f15c28 (patch) | |
tree | 5e6a0461e12b234f083c96b26f377815f12c3786 /js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js | |
parent | 610ddac8d17518c6c6bfb5cc02445152ae2a015d (diff) | |
parent | 1a70520402677cf3ba257921839a656dcf9a76c2 (diff) | |
download | ninja-124c1e0e4bf7a0523e641ee37352128690f15c28.tar.gz |
Merge branch 'integration' of github.com:ericmueller/ninja-internal into integration
Diffstat (limited to 'js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js')
-rwxr-xr-x | js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js | 13 |
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 | // |