From 45589315c1dd63c9f9a4506c43e07a2a62c506df Mon Sep 17 00:00:00 2001
From: joshua-gould <jgould@broadinstitute.org>
Date: Thu, 7 Apr 2016 10:20:32 -0400
Subject: [PATCH] inherit color scheme

---
 src/ui/heat_map.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/ui/heat_map.js b/src/ui/heat_map.js
index 2ba8e9a..7f2e861 100644
--- a/src/ui/heat_map.js
+++ b/src/ui/heat_map.js
@@ -291,7 +291,7 @@ morpheus.HeatMap = function(options) {
 		'-o-user-select' : 'none',
 		'-o-user-drag' : 'none',
 		'-o-tap-highlight-color' : 'rgba(0, 0, 0, 0)',
-
+		
 		'overflow' : ''
 	});
 
@@ -1539,7 +1539,7 @@ morpheus.HeatMap.prototype = {
 
 		reorderTracks(this.options.rows, false);
 		reorderTracks(this.options.columns, true);
-
+		var colorSchemeSpecified = this.options.colorScheme != null;
 		if (this.options.colorScheme == null) {
 			var ext = '';
 			if (this.options.dataSource) {
@@ -1581,7 +1581,7 @@ morpheus.HeatMap.prototype = {
 		}
 
 		if (this.options.parent && this.options.inheritFromParent
-				&& !this.options.colorScheme) {
+				&& !colorSchemeSpecified) {
 			heatmap.setColorScheme(this.options.parent.heatmap.getColorScheme()
 					.copy(this.project));
 		} else {
@@ -3251,6 +3251,7 @@ morpheus.HeatMap.prototype = {
 		this.$parent.css({
 			height : Math.ceil(totalHeight) + 'px'
 		});
+
 		this.updatingScroll = false;
 		this.trigger('change', {
 			name : 'revalidate',
-- 
GitLab