renamed heatmap.$el

src/ui/heat_map.js

@@ -270,8 +270,8 @@ morpheus.HeatMap = function(options) {
 		}
 		this.tabManager = this.options.parent.tabManager;
 	}
-	this.$el = $('<div></div>');
-	this.$el.css({
+	this.$content = $('<div></div>');
+	this.$content.css({
 		'width' : '100%',
 
 		'user-select' : 'none',
@@ -297,7 +297,7 @@ morpheus.HeatMap = function(options) {
 	});
 
 	var tab = this.tabManager.add({
-		$el : this.$el,
+		$el : this.$content,
 		closeable : true,
 		rename : true,
 		title : this.options.name,
@@ -305,7 +305,7 @@ morpheus.HeatMap = function(options) {
 		focus : true
 	});
 	if (options.$loadingImage) {
-		options.$loadingImage.appendTo(this.$el);
+		options.$loadingImage.appendTo(this.$content);
 	}
 
 	this.tabId = tab.id;
@@ -314,7 +314,6 @@ morpheus.HeatMap = function(options) {
 			: (options.dataset.file ? options.dataset.file : options.dataset);
 	this._togglingInfoWindow = false;
 	this.tooltipMode = 0; // 0=docked, 1=dialog, 2=follow
-	this.el = this.$el[0];
 
 	var promises = [];
 	if (options.promises) {
@@ -373,7 +372,7 @@ morpheus.HeatMap = function(options) {
 
 			};
 			$(window).on('orientationchange resize', resize);
-			_this.$el.on('remove', function() {
+			_this.$content.on('remove', function() {
 				$(window).off('orientationchange resize', resize);
 			});
 		}
@@ -1097,7 +1096,7 @@ morpheus.HeatMap.prototype = {
 		this.whenLoaded = null;
 		this.$parent = $('<div></div>').css('position', 'relative');
 
-		this.$parent.appendTo(this.$el);
+		this.$parent.appendTo(this.$content);
 		this.toolbar = new morpheus.HeatMapToolBar(this);
 		if (this.options.customUrls) {
 			this.setCustomUrls(this.options.customUrls);

src/ui/heat_map_key_listener.js

@@ -134,7 +134,7 @@ morpheus.HeatMapKeyListener = function(controller) {
 			return false;
 		}
 	};
-	var $keyelement = controller.$el;
+	var $keyelement = controller.$content;
 	$keyelement.on('keydown', keydown);
 	$keyelement.on('dragover.morpheus dragenter.morpheus', function(e) {
 		e.preventDefault();

src/ui/heat_map_toolbar.js

@@ -271,7 +271,7 @@ morpheus.HeatMapToolBar = function(controller) {
 	$search.appendTo($el.find('[name=toolbarSearch]'));
 	$(toolbarHtml.join('')).appendTo($toolbarForm);
 	$toolbarForm.appendTo($el.find('[name=toolbarButtons]'));
-	$el.prependTo(controller.$el);
+	$el.prependTo(controller.$content);
 	// gapi.hangout.render('hangout-div', {
 	// 'widget_size' : '72',
 	// 'render' : 'createhangout'

src/ui/vector_track.js

@@ -352,9 +352,9 @@ morpheus.VectorTrack.prototype = {
 						.isRenderAs(morpheus.VectorTrack.RENDER.BAR))) {
 			if (this.getFullVector().getProperties().has(
 					morpheus.VectorKeys.FIELDS)
-					|| _.isNumber(morpheus.VectorUtil.getFirstNonNull(this
-							.getFullVector()))) {
+					|| morpheus.VectorUtil.getDataType(this.getFullVector()) === 'number') {
 				this.settings.discrete = false;
+				this.settings.highlightMatchingValues = false;
 			}
 			this.settings.discreteAutoDetermined = true;
 		}
@@ -398,24 +398,24 @@ morpheus.VectorTrack.prototype = {
 					var doRequest = function(smile) {
 						$
 								.ajax(
-							{
-								contentType : 'text/plain',
-								context : {
-									smile : smile
-								},
-								data : {
-									'string' : smile,
-									'representation' : 'sdf'
-								},
-								url : 'http://cactus.nci.nih.gov/chemical/structure',
-							}).done(function(text) {
-								_this.moleculeCache[this.smile] = text;
-								if (values.length > 0) {
-									doRequest(values.pop());
-								}
-								_this.invalid = true;
-								_this.repaint();
-							});
+										{
+											contentType : 'text/plain',
+											context : {
+												smile : smile
+											},
+											data : {
+												'string' : smile,
+												'representation' : 'sdf'
+											},
+											url : 'http://cactus.nci.nih.gov/chemical/structure',
+										}).done(function(text) {
+									_this.moleculeCache[this.smile] = text;
+									if (values.length > 0) {
+										doRequest(values.pop());
+									}
+									_this.invalid = true;
+									_this.repaint();
+								});
 					};
 					for (var i = 0; i < 6; i++) {
 						doRequest(values.pop());
@@ -1075,10 +1075,10 @@ morpheus.VectorTrack.prototype = {
 		morpheus.Popup
 				.showPopup(
 						items,
-			{
-				x : e.pageX,
-				y : e.pageY
-			},
+						{
+							x : e.pageX,
+							y : e.pageY
+						},
 						e.target,
 						function(event, item) {
 							var customItem;
@@ -1278,12 +1278,12 @@ morpheus.VectorTrack.prototype = {
 												project
 														.trigger(
 																'trackChanged',
-													{
-														vectors : [ v ],
-														render : existingVector != null ? []
+																{
+																	vectors : [ v ],
+																	render : existingVector != null ? []
 																			: [ morpheus.VectorTrack.RENDER.TEXT ],
-														columns : isColumns
-													});
+																	columns : isColumns
+																});
 											}
 										});
 							} else if (item === DELETE) {
@@ -1358,18 +1358,18 @@ morpheus.VectorTrack.prototype = {
 													project
 															.trigger(
 																	'rowTrackRemoved',
-														{
-															vector : _this
+																	{
+																		vector : _this
 																				.getFullVector()
-														});
+																	});
 												} else {
 													project
 															.trigger(
 																	'columnTrackRemoved',
-														{
-															vector : _this
+																	{
+																		vector : _this
 																				.getFullVector()
-														});
+																	});
 												}
 											}
 										});
@@ -1589,13 +1589,13 @@ morpheus.VectorTrack.prototype = {
 										.getRowColorModel();
 								if (_this.settings.discrete) {
 									colorSchemeChooser = new morpheus.DiscreteColorSchemeChooser(
-										{
-											colorScheme : {
-												scale : colorModel
+											{
+												colorScheme : {
+													scale : colorModel
 															.getDiscreteColorScheme(_this
 																	.getFullVector())
-											}
-										});
+												}
+											});
 									colorSchemeChooser.on('change', function(
 											event) {
 										colorModel.setMappedValue(_this
@@ -1606,9 +1606,9 @@ morpheus.VectorTrack.prototype = {
 									});
 								} else {
 									colorSchemeChooser = new morpheus.HeatMapColorSchemeChooser(
-										{
-											showRelative : false,
-										});
+											{
+												showRelative : false,
+											});
 									colorSchemeChooser
 											.setColorScheme(colorModel
 													.getContinuousColorScheme(_this