Commit d75438e8 authored by Joshua Gould's avatar Joshua Gould

scroll lens updates

parent db2d4b78
...@@ -2316,9 +2316,10 @@ morpheus.HeatMap.prototype = { ...@@ -2316,9 +2316,10 @@ morpheus.HeatMap.prototype = {
} else if (this.tooltipMode === 1) { } else if (this.tooltipMode === 1) {
this.$tipInfoWindow.html(tipText); this.$tipInfoWindow.html(tipText);
} }
if (tipFollowText !== '') { if (tipFollowText !== '') {
this.tipFollowHidden = false; 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); this._updateTipFollowPosition(options);
} else { } else {
this.tipFollowHidden = true; this.tipFollowHidden = true;
......
This diff is collapsed.
This diff is collapsed.
...@@ -19,7 +19,7 @@ morpheus.ScentedSearch = function (model, positions, isVertical, scrollbar, ...@@ -19,7 +19,7 @@ morpheus.ScentedSearch = function (model, positions, isVertical, scrollbar,
scrollbar.canvas.style.cursor = index < 0 ? 'default' : 'pointer'; scrollbar.canvas.style.cursor = index < 0 ? 'default' : 'pointer';
var tipOptions = { var tipOptions = {
event: e, event: e,
heatMapLens: true heatMapLens: index >= 0
}; };
if (isVertical) { if (isVertical) {
controller.setToolTip(index >= 0 ? _this.searchIndices[index] : -1, controller.setToolTip(index >= 0 ? _this.searchIndices[index] : -1,
...@@ -35,6 +35,7 @@ morpheus.ScentedSearch = function (model, positions, isVertical, scrollbar, ...@@ -35,6 +35,7 @@ morpheus.ScentedSearch = function (model, positions, isVertical, scrollbar,
// but the canvas cursor has no effect // but the canvas cursor has no effect
document.body.style.cursor = 'default'; document.body.style.cursor = 'default';
scrollbar.canvas.style.cursor = 'default'; scrollbar.canvas.style.cursor = 'default';
controller.setToolTip(-1, -1, {event: e});
}; };
$(scrollbar.canvas).on('mousemove', mouseMove).on('mouseout', mouseExit); $(scrollbar.canvas).on('mousemove', mouseMove).on('mouseout', mouseExit);
}; };
...@@ -215,4 +216,4 @@ morpheus.ScentedSearch.prototype = { ...@@ -215,4 +216,4 @@ morpheus.ScentedSearch.prototype = {
} }
}; };
morpheus.Util.extend(morpheus.ScentedSearch, morpheus.AbstractCanvas); morpheus.Util.extend(morpheus.ScentedSearch, morpheus.AbstractCanvas);
\ No newline at end of file
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