scroll lens updates

src/ui/heat_map.js

@@ -2316,9 +2316,10 @@ morpheus.HeatMap.prototype = {
 		} else if (this.tooltipMode === 1) {
 			this.$tipInfoWindow.html(tipText);
 		}
+
 		if (tipFollowText !== '') {
 			this.tipFollowHidden = false;
-			this.$tipFollow.css('class', 'morpheus-tip-inline morpheus-padding-ver').html('<span style="max-width:400px;">' + tipFollowText + '</span>');
+			this.$tipFollow.html('<span style="max-width:400px;">' + tipFollowText + '</span>');
 			this._updateTipFollowPosition(options);
 		} else {
 			this.tipFollowHidden = true;

src/ui/heat_map_tooltip_provider.js

-morpheus.HeatMapTooltipProvider = function(heatMap, rowIndex, columnIndex,
+morpheus.HeatMapTooltipProvider = function (heatMap, rowIndex, columnIndex,
 											options, separator, quick) {
 	var dataset = heatMap.project.getSortedFilteredDataset();
 	var tipText = [];
 	if (!quick) {
 		if (options.value) { // key value pairs for custom tooltip
-			_.each(options.value, function(pair) {
+			_.each(options.value, function (pair) {
 				if (tipText.length > 0) {
 					tipText.push(separator);
 				}
@@ -31,7 +31,7 @@ morpheus.HeatMapTooltipProvider = function(heatMap, rowIndex, columnIndex,
 				options.showSeriesNameInTooltip || i > 0);
 		}
 		if (quick) {
-			var quickRowTracks = heatMap.rowTracks.filter(function(t) {
+			var quickRowTracks = heatMap.rowTracks.filter(function (t) {
 				return t.settings.inlineTooltip;
 			});
 			morpheus.HeatMapTooltipProvider._tracksToString(options,
@@ -44,7 +44,7 @@ morpheus.HeatMapTooltipProvider = function(heatMap, rowIndex, columnIndex,
 			// style="height:1px;background-color:LightGrey;"></div>');
 			// }
 			morpheus.HeatMapTooltipProvider._tracksToString(options,
-					heatMap.columnTracks.filter(function(t) {
+				heatMap.columnTracks.filter(function (t) {
 					return t.settings.inlineTooltip;
 				}), dataset.getColumnMetadata(), columnIndex, tipText,
 				separator);
@@ -98,19 +98,19 @@ morpheus.HeatMapTooltipProvider = function(heatMap, rowIndex, columnIndex,
 		}
 		if (selectedRowNodes.length > 0 && rowNodes.length > 0) {
 			var nodeIds = {};
-			_.each(selectedRowNodes, function(n) {
+			_.each(selectedRowNodes, function (n) {
 				nodeIds[n.id] = true;
 			});
-			rowNodes = _.filter(rowNodes, function(n) {
+			rowNodes = _.filter(rowNodes, function (n) {
 				return nodeIds[n.id] === undefined;
 			});
 		}
 		if (selectedColumnNodes.length > 0 && columnNodes.length > 0) {
 			var nodeIds = {};
-			_.each(selectedColumnNodes, function(n) {
+			_.each(selectedColumnNodes, function (n) {
 				nodeIds[n.id] = true;
 			});
-			columnNodes = _.filter(columnNodes, function(n) {
+			columnNodes = _.filter(columnNodes, function (n) {
 				return nodeIds[n.id] === undefined;
 			});
 		}
@@ -134,7 +134,7 @@ morpheus.HeatMapTooltipProvider = function(heatMap, rowIndex, columnIndex,
 	return tipText.join('');
 };
 
-morpheus.HeatMapTooltipProvider._matrixValueToString = function(dataset,
+morpheus.HeatMapTooltipProvider._matrixValueToString = function (dataset,
 																 rowIndex, columnIndex, seriesIndex, tipText, separator,
 																 showSeriesNameInTooltip) {
 	var val = dataset.getValue(rowIndex, columnIndex, seriesIndex);
@@ -142,7 +142,21 @@ morpheus.HeatMapTooltipProvider._matrixValueToString = function(dataset,
 		if (val.toObject || !_.isNumber(val)) {
 			var obj = val.toObject ? val.toObject() : val;
 			var keys = _.keys(obj);
-			_.each(keys, function(key) {
+			if (keys.length === 0) {
+				var v = morpheus.Util.formatObject(obj);
+				if (tipText.length > 0) {
+					tipText.push(separator);
+				}
+				if (showSeriesNameInTooltip) {
+					tipText.push(dataset.getName(seriesIndex));
+					tipText.push(': ');
+				}
+				tipText.push('<b>');
+				tipText.push(v);
+				tipText.push('</b>');
+			} else {
+				for (var i = 0, nkeys = keys.length; i < nkeys; i++) {
+					var key = keys[i];
 					if (key !== '__v') { // special value key
 						var v = morpheus.Util.formatObject(obj[key]);
 						if (tipText.length > 0) {
@@ -153,7 +167,9 @@ morpheus.HeatMapTooltipProvider._matrixValueToString = function(dataset,
 						tipText.push(v);
 						tipText.push('</b>');
 					}
-			});
+				}
+			}
+
 		} else {
 			if (tipText.length > 0) {
 				tipText.push(separator);
@@ -170,9 +186,9 @@ morpheus.HeatMapTooltipProvider._matrixValueToString = function(dataset,
 	}
 };
 
-morpheus.HeatMapTooltipProvider.vectorToString = function(vector, index,
+morpheus.HeatMapTooltipProvider.vectorToString = function (vector, index,
 														   tipText, separator, additionalVector) {
-	var arrayValueToString = function(arrayFieldName, arrayVal) {
+	var arrayValueToString = function (arrayFieldName, arrayVal) {
 		if (arrayVal != null) {
 			if (arrayFieldName != null) {
 				if (tipText.length > 0) {
@@ -184,7 +200,7 @@ morpheus.HeatMapTooltipProvider.vectorToString = function(vector, index,
 				tipText.push(' ');
 				var obj = arrayVal.toObject();
 				var keys = _.keys(obj);
-				_.each(keys, function(key) {
+				_.each(keys, function (key) {
 					var subVal = obj[key];
 					if (subVal != null && subVal != '') {
 						if (tipText.length > 0) {
@@ -256,16 +272,14 @@ morpheus.HeatMapTooltipProvider.vectorToString = function(vector, index,
 		}
 	}
 };
-morpheus.HeatMapTooltipProvider._tracksToString = function(options, tracks,
-		metadata, index, tipText, separator) {
+morpheus.HeatMapTooltipProvider._tracksToString = function (options, tracks, metadata, index, tipText, separator) {
 	for (var i = 0; i < tracks.length; i++) {
-		var vector = metadata.getByName(tracks[i].name);
-		morpheus.HeatMapTooltipProvider.vectorToString(vector, index, tipText,
+		morpheus.HeatMapTooltipProvider.vectorToString(metadata.getByName(tracks[i].name), index, tipText,
 			separator);
 
 	}
 };
-morpheus.HeatMapTooltipProvider._metadataToString = function(options, tracks,
+morpheus.HeatMapTooltipProvider._metadataToString = function (options, tracks,
 															  metadata, index, tipText, separator) {
 	var filtered = [];
 	for (var i = 0, ntracks = tracks.length; i < ntracks; i++) {
@@ -276,19 +290,17 @@ morpheus.HeatMapTooltipProvider._metadataToString = function(options, tracks,
 			} else {
 				filtered.push(track);
 			}
-
 		}
 	}
 
 	// show the vector that we're mousing over 1st
-
 	morpheus.HeatMapTooltipProvider._tracksToString(options, filtered,
 		metadata, index, tipText, separator);
 
 };
-morpheus.HeatMapTooltipProvider._nodesToString = function(tipText, nodes,
+morpheus.HeatMapTooltipProvider._nodesToString = function (tipText, nodes,
 														   color, separator) {
-	var renderField = function(name, value) {
+	var renderField = function (name, value) {
 		if (value != null) {
 			if (tipText.length > 0) {
 				tipText.push(separator);
@@ -314,9 +326,9 @@ morpheus.HeatMapTooltipProvider._nodesToString = function(tipText, nodes,
 			}
 		}
 	};
-	_.each(nodes, function(node) {
+	_.each(nodes, function (node) {
 		if (node.info) {
-			for ( var name in node.info) {
+			for (var name in node.info) {
 				var value = node.info[name];
 				renderField(name, value);
 			}

src/ui/scented_search.js

@@ -19,7 +19,7 @@ morpheus.ScentedSearch = function (model, positions, isVertical, scrollbar,
 		scrollbar.canvas.style.cursor = index < 0 ? 'default' : 'pointer';
 		var tipOptions = {
 			event: e,
-			heatMapLens: true
+			heatMapLens: index >= 0
 		};
 		if (isVertical) {
 			controller.setToolTip(index >= 0 ? _this.searchIndices[index] : -1,
@@ -35,6 +35,7 @@ morpheus.ScentedSearch = function (model, positions, isVertical, scrollbar,
 		// but the canvas cursor has no effect
 		document.body.style.cursor = 'default';
 		scrollbar.canvas.style.cursor = 'default';
+		controller.setToolTip(-1, -1, {event: e});
 	};
 	$(scrollbar.canvas).on('mousemove', mouseMove).on('mouseout', mouseExit);
 };