diff --git a/src/ui/heat_map_color_scheme.js b/src/ui/heat_map_color_scheme.js index c4302c0521168dbb3b879d366ad3ac15c319ca44..9f417e9727accf16df316e36fc8fda7c45e796a7 100644 --- a/src/ui/heat_map_color_scheme.js +++ b/src/ui/heat_map_color_scheme.js @@ -429,7 +429,7 @@ morpheus.HeatMapColorScheme.prototype = { : new morpheus.GradientColorSupplier(); newColorSupplier.sizer = oldColorSupplier.getSizer(); newColorSupplier.conditions = oldColorSupplier.getConditions(); - newColorSupplier.getScalingMode(oldColorSupplier.getScalingMode()); + newColorSupplier.setScalingMode(oldColorSupplier.getScalingMode()); newColorSupplier.setMin(oldColorSupplier.getMin()); newColorSupplier.setMax(oldColorSupplier.getMax()); newColorSupplier.setFractions({ @@ -449,8 +449,8 @@ morpheus.HeatMapColorScheme.prototype = { _.each(_.keys(this.rowValueToColorSupplier), function(key) { // save each scheme var val = _this.rowValueToColorSupplier[key]; -// delete val.sizer; -// delete val.conditions; + // delete val.sizer; + // delete val.conditions; json.colorSchemes[key] = val; }); diff --git a/src/ui/heat_map_color_scheme_chooser.js b/src/ui/heat_map_color_scheme_chooser.js index 631628e25bb3732502c01879bc908d7d53e0966c..79ea9ec9a549758d65d410ed4170003a23c3b03e 100644 --- a/src/ui/heat_map_color_scheme_chooser.js +++ b/src/ui/heat_map_color_scheme_chooser.js @@ -140,29 +140,26 @@ morpheus.HeatMapColorSchemeChooser = function(options) { formBuilder.$form.on('change', '[name=missing_color]', function(e) { var color = $(this).val(); that.colorScheme.setMissingColor(color); - that.fireChanged(); + that.fireChanged(false); }); formBuilder.$form.on('change', '[name=stepped_colors]', function(e) { that.colorScheme.setStepped($(this).prop('checked')); that.fireChanged(); }); formBuilder.$form.on('keyup', '[name=minimum]', _.debounce(function(e) { - var val = parseFloat($(this).val()); if (!isNaN(val)) { that.colorScheme.setMin(val); that.setSelectedIndex(that.legend.selectedIndex); - that.fireChanged(); + that.fireChanged(false); } - }, 100)); formBuilder.$form.on('keyup', '[name=maximum]', _.debounce(function(e) { - var val = parseFloat($(this).val()); if (!isNaN(val)) { that.colorScheme.setMax(val); that.setSelectedIndex(that.legend.selectedIndex); - that.fireChanged(); + that.fireChanged(false); } }, 100)); @@ -290,10 +287,11 @@ morpheus.HeatMapColorSchemeChooser.prototype = { [ this.legend.border, this.legend.getUnscaledWidth() - this.legend.border ]); }, - fireChanged : function() { + fireChanged : function(noreset) { this.trigger('change'); - // restore currentValue - this.setColorScheme(this.colorScheme); + if (noreset !== false) { + this.setColorScheme(this.colorScheme); + } }, draw : function() { var colorScheme = this.colorScheme;