Skip to content

GitLab

M
morpheus.js
Commit 45589315 authored by joshua-gould's avatar joshua-gould
Browse files
Options

inherit color scheme

parent f4b29778
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
src/ui/heat_map.js
View file @ 45589315
...@@ -1539,7 +1539,7 @@ morpheus.HeatMap.prototype = { ...@@ -1539,7 +1539,7 @@ morpheus.HeatMap.prototype = {
reorderTracks(this.options.rows, false); reorderTracks(this.options.rows, false);
reorderTracks(this.options.columns, true); reorderTracks(this.options.columns, true);
var colorSchemeSpecified = this.options.colorScheme != null;
if (this.options.colorScheme == null) { if (this.options.colorScheme == null) {
var ext = ''; var ext = '';
if (this.options.dataSource) { if (this.options.dataSource) {
...@@ -1581,7 +1581,7 @@ morpheus.HeatMap.prototype = { ...@@ -1581,7 +1581,7 @@ morpheus.HeatMap.prototype = {
} }
if (this.options.parent && this.options.inheritFromParent if (this.options.parent && this.options.inheritFromParent
&& !this.options.colorScheme) { && !colorSchemeSpecified) {
heatmap.setColorScheme(this.options.parent.heatmap.getColorScheme() heatmap.setColorScheme(this.options.parent.heatmap.getColorScheme()
.copy(this.project)); .copy(this.project));
} else { } else {
...@@ -3251,6 +3251,7 @@ morpheus.HeatMap.prototype = { ...@@ -3251,6 +3251,7 @@ morpheus.HeatMap.prototype = {
this.$parent.css({ this.$parent.css({
height : Math.ceil(totalHeight) + 'px' height : Math.ceil(totalHeight) + 'px'
}); });
this.updatingScroll = false; this.updatingScroll = false;
this.trigger('change', { this.trigger('change', {
name : 'revalidate', name : 'revalidate',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment