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 #257 from mathieubigorne/master

Browse Source 
pointSize attribute should accept an array of values
This commit is contained in:
Olly Smith 2013-10-12 05:35:34 -07:00
commit d889eb6268
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/morris.line.coffee
View File

@ -7,8 +7,11 @@ class Morris.Line extends Morris.Grid
init: ->
# Some instance variables for later
@pointGrow = Raphael.animation r: @options.pointSize + 3, 25, 'linear'
@pointShrink = Raphael.animation r: @options.pointSize, 25, 'linear'
@pointGrow = []
@pointShrink = []
for pointSize in @options.pointSizes
@pointGrow.push Raphael.animation r: pointSize + 3, 25, 'linear'
@pointShrink.push Raphael.animation r: pointSize, 25, 'linear'
if @options.hideHover isnt 'always'
@hover = new Morris.Hover(parent: @el)
@ -20,7 +23,7 @@ class Morris.Line extends Morris.Grid
#
defaults:
lineWidth: 3
pointSize: 4
pointSizes: [4]
lineColors: [
'#0b62a4'
'#7A92A3'
@ -198,7 +201,7 @@ class Morris.Line extends Morris.Grid
for row in @data
circle = null
if row._y[index]?
circle = @drawLinePoint(row._x, row._y[index], @options.pointSize, @colorFor(row, index, 'point'), index)
circle = @drawLinePoint(row._x, row._y[index], @options.pointSizes[index % @options.pointSizes.length], @colorFor(row, index, 'point'), index)
@seriesPoints[index].push(circle)
_drawLineFor: (index) ->
@ -259,11 +262,11 @@ class Morris.Line extends Morris.Grid
if @prevHilight isnt null and @prevHilight isnt index
for i in [0..@seriesPoints.length-1]
if @seriesPoints[i][@prevHilight]
@seriesPoints[i][@prevHilight].animate @pointShrink
@seriesPoints[i][@prevHilight].animate @pointShrink[i]
if index isnt null and @prevHilight isnt index
for i in [0..@seriesPoints.length-1]
if @seriesPoints[i][index]
@seriesPoints[i][index].animate @pointGrow
@seriesPoints[i][index].animate @pointGrow[i]
@prevHilight = index
colorFor: (row, sidx, type) ->

5
spec/lib/line/line_spec.coffee
View File

@ -181,6 +181,7 @@ describe 'Morris.Line', ->
gridStrokeWidth: 0.5
gridTextColor: '#888'
gridTextSize: 12
pointSizes: [5]
it 'should have circles with configured fill color', ->
chart = Morris.Line $.extend {}, defaults
@ -205,3 +206,7 @@ describe 'Morris.Line', ->
it 'should have text with configured font size', ->
chart = Morris.Line $.extend {}, defaults
$('#graph').find("text[fill='#888888']").size().should.equal 9
it 'should have circle with configured size', ->
chart = Morris.Line $.extend {}, defaults
$('#graph').find("circle[r='5']").size().should.equal 2