Robot/morris.js
1
0
Fork 0
mirror of https://github.com/morrisjs/morris.js.git synced 2024-11-10 21:36:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #568 from leriel/hover-bars

Browse Source 
add option to fade in bars on hover
This commit is contained in:
Jelte Fennema 2015-05-08 14:28:59 +02:00
commit 08064399d6
2 changed files with 63 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
examples/bar-highlight-hover.html Normal file
View File

@ -0,0 +1,39 @@
<!doctype html>
<head>
<script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/raphael/2.1.2/raphael-min.js"></script>
<script src="../morris.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/prettify/r224/prettify.min.js"></script>
<script src="lib/example.js"></script>
<link rel="stylesheet" href="lib/example.css">
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/prettify/r224/prettify.min.css">
<style type="text/css">
.morris-hover.morris-default-style {
display: none !important;
}
</style>
</head>
<body>
<h1>Title</h1>
<div id="graph"></div>
<pre id="code" class="prettyprint linenums">
Morris.Bar({
element: 'graph',
data: [
{x: 'One', y: 3, z: 2, a: 1, q: 2},
{x: 'Two', y: 2, z: null, a: 1, q: 2},
{x: 'Three', y: 0, z: 2, a: 1, q: 2},
{x: 'Four', y: 2, z: 4, a: 1, q: 2}
],
xkey: 'x',
ykeys: ['y', 'z'],
labels: [],
barColors: ['#1fbba6', '#f8aa33', '#4da74d', '#afd8f8', '#edc240', '#cb4b4b', '#9440ed'],
barOpacity: 0.5,
resize: true,
gridTextColor: '#666',
grid: false
});
</pre>
</body>

26
lib/morris.bar.coffee
View File

@ -27,6 +27,8 @@ class Morris.Bar extends Morris.Grid
'#9440ed' '#9440ed'
], ],
barOpacity: 1.0 barOpacity: 1.0
barHighlightOpacity: 1.0
highlightSpeed: 150
barRadius: [0, 0, 0, 0] barRadius: [0, 0, 0, 0]
xLabelMargin: 50 xLabelMargin: 50
horizontal: false horizontal: false
@ -132,6 +134,7 @@ class Morris.Bar extends Morris.Grid
# #
# @private # @private
drawSeries: -> drawSeries: ->
@seriesBars = []
groupWidth = @xSize / @options.data.length groupWidth = @xSize / @options.data.length
if @options.stacked if @options.stacked
@ -148,6 +151,7 @@ class Morris.Bar extends Morris.Grid
leftPadding = spaceLeft / 2 leftPadding = spaceLeft / 2
zeroPos = if @ymin <= 0 and @ymax >= 0 then @transY(0) else null zeroPos = if @ymin <= 0 and @ymax >= 0 then @transY(0) else null
@bars = for row, idx in @data @bars = for row, idx in @data
@seriesBars[idx] = []
lastTop = 0 lastTop = 0
for ypos, sidx in row._y for ypos, sidx in row._y
if not @hasToShow(sidx) if not @hasToShow(sidx)
@ -174,11 +178,11 @@ class Morris.Bar extends Morris.Grid
top -= lastTop if @options.stacked top -= lastTop if @options.stacked
if not @options.horizontal if not @options.horizontal
lastTop += size lastTop += size
@drawBar(left, top, barWidth, size, @colorFor(row, sidx, 'bar'), @seriesBars[idx][sidx] = @drawBar(left, top, barWidth, size, @colorFor(row, sidx, 'bar'),
@options.barOpacity, @options.barRadius) @options.barOpacity, @options.barRadius)
else else
lastTop -= size lastTop -= size
@drawBar(top, left, size, barWidth, @colorFor(row, sidx, 'bar'), @seriesBars[idx][sidx] = @drawBar(top, left, size, barWidth, @colorFor(row, sidx, 'bar'),
@options.barOpacity, @options.barRadius) @options.barOpacity, @options.barRadius)
if @options.inBarValue and if @options.inBarValue and
@ -198,6 +202,22 @@ class Morris.Bar extends Morris.Grid
@flat_bars = $.grep @flat_bars, (n) -> return n? @flat_bars = $.grep @flat_bars, (n) -> return n?
@bar_els = $($.map @flat_bars, (n) -> return n[0]) @bar_els = $($.map @flat_bars, (n) -> return n[0])
# hightlight the bar on hover
#
# @private
hilight: (index) ->
if @seriesBars && @seriesBars[@prevHilight] && @prevHilight != null && @prevHilight != index
for y,i in @seriesBars[@prevHilight]
if y
y.animate({'fill-opacity': @options.barOpacity}, @options.highlightSpeed)
if @seriesBars && @seriesBars[index] && index != null && @prevHilight != index
for y,i in @seriesBars[index]
if y
y.animate({'fill-opacity': @options.barHighlightOpacity}, @options.highlightSpeed)
@prevHilight = index
# @private # @private
# #
# @param row [Object] row data # @param row [Object] row data
@ -238,6 +258,7 @@ class Morris.Bar extends Morris.Grid
# @private # @private
onHoverMove: (x, y) => onHoverMove: (x, y) =>
index = @hitTest(x, y) index = @hitTest(x, y)
@hilight(index)
if index? if index?
@hover.update(@hoverContentForRow(index)...) @hover.update(@hoverContentForRow(index)...)
else else
@ -247,6 +268,7 @@ class Morris.Bar extends Morris.Grid
# #
# @private # @private
onHoverOut: => onHoverOut: =>
@hilight(-1)
if @options.hideHover isnt false if @options.hideHover isnt false
@hover.hide() @hover.hide()