Olly Smith
0e8c0f49b6
Merge branch, and merge with previous changes.
...
Previous point-width work by other contributors conflicted, so have tied
the two changes and sets of tests together. Have also slightly changed
some variable / config names to read easier.
Merge branch 'master' of https://github.com/dgilperez/morris.js into dgilperez-master
Conflicts:
lib/morris.line.coffee
morris.js
morris.min.js
2013-10-12 13:58:10 +01:00
Olly Smith
d889eb6268
Merge pull request #257 from mathieubigorne/master
...
pointSize attribute should accept an array of values
2013-10-12 05:35:34 -07:00
Olly Smith
96e918a297
Merge branch 'disable-individual-axes' of https://github.com/arachnys/morris.js into arachnys-disable-individual-axes
...
Conflicts:
morris.min.js
2013-10-12 13:32:25 +01:00
Olly Smith
e868701016
Merge branch 'range-selection' of https://github.com/arachnys/morris.js into arachnys-range-selection
...
Conflicts:
morris.min.js
2013-10-12 13:27:35 +01:00
Olly Smith
019a04ed08
Merge branch 'label_specs_week' of https://github.com/dhoko/morris.js into dhoko-label_specs_week
...
Conflicts:
morris.min.js
2013-10-12 13:24:09 +01:00
David Gil
8817e221b5
fix hilight WIP
2013-08-20 04:10:18 +02:00
David Gil
92d7790908
pointGrow and pointShrink must adapt to the point size position of the index
2013-08-20 04:06:07 +02:00
David Gil
f4478828e4
making point size customizable per line as well
2013-08-20 03:39:43 +02:00
David Gil
cdfe8ba62d
add missing index
2013-08-20 02:55:44 +02:00
David Gil
c613aeb988
make line widths customizable
2013-08-20 02:38:48 +02:00
Taku AMANO
13af310795
Use the @options.smooth directly if the value's type is "boolean".
2013-07-30 10:39:25 +09:00
Mathieu Bigorne
ace9fafaa6
pointSizes accepts an array of value, one per serie
2013-07-02 12:10:25 +02:00
Omar Khan
d1420482f1
axes option can be true, false, 'both', 'x', 'y'
2013-06-23 22:47:44 +01:00
Omar Khan
cccf319f38
Add xaxis and yaxis options for disabling axes individually
2013-06-20 13:09:04 +01:00
Omar Khan
7d46e6e903
Add range selection to Morris.Grid
2013-06-17 18:50:19 +01:00
dhoko
b192a00d68
Add week in label_specs
2013-06-04 21:38:35 +02:00
Olly Smith
8493b6ec25
Fix hideHover ( fixes #236 ).
2013-05-12 17:12:59 +01:00
Olly Smith
6220c40217
Add gridTextFamily and gridTextWeight options.
2013-05-12 16:25:06 +01:00
Olly Smith
05cdc7f3e4
Angled labels.
2013-05-09 22:15:05 +01:00
Marcin Chwedziak
3960ecfcdb
adds xLabelsDiagonal options, as asked in #235
2013-05-09 21:21:52 +02:00
Olly Smith
67caadb600
Customizing hover content using default content ( fixes #179 ).
2013-04-14 10:25:14 +01:00
Olly Smith
76921e0f88
Merge branch 'event-handling' of https://github.com/tiraeth/morris.js
...
Conflicts:
morris.min.js
2013-04-01 21:29:55 +01:00
Marcin Chwedziak
3a2ab2e909
Merge branch 'master' into event-handling
...
Conflicts:
lib/morris.donut.coffee
morris.js
morris.min.js
2013-03-31 20:39:32 +02:00
Marcin Chwedziak
3c9fff0aa0
#199 , added behaveLikeLine and fillOpacity options, refactored morris.line to separate line and point draw operation
2013-03-31 20:16:35 +02:00
Olly Smith
4cab2bbabb
Fix DST handling.
2013-03-14 22:08:19 +00:00
Olly Smith
811dc87d8b
Hide chart when setData is passed empty or null array. ( Fixes #142 )
2013-02-06 07:35:54 +00:00
Olly Smith
cd5129c489
Merge branch 'wrap_raphael_add_classes' of https://github.com/chriserin/morris.js into chriserin-wrap_raphael_add_classes
...
Conflicts:
lib/morris.donut.coffee
2013-01-24 15:48:39 -08:00
tiraeth
2489c1a430
fixed hideHover=auto for line/area chart
2013-01-02 12:19:52 +01:00
Christopher Erin
32b06226c2
draw functionality broken out into methods on each class
2012-12-31 12:09:38 -06:00
m.chwedziak
889a2e8cda
Click events for current oesmith/master
2012-12-31 12:02:14 +01:00
Christopher Erin
14c56165c6
encapsulate all interaction with raphael. Reuse some methods. Write tests for all svg structural elements and attributes
2012-12-30 13:29:26 -06:00
Olly Smith
4f53479cf0
xLabelMargin optionx.
2012-12-20 19:15:33 +00:00
Olly Smith
06a2ab3501
Option for hiding axes.
2012-12-20 07:50:16 +00:00
Olly Smith
c82d335976
Tidy up grid option.
2012-12-20 07:44:32 +00:00
Olly Smith
672583b1e7
Option to disable grid drawing.
...
Merge branch 'issue-114' of github.com:tiraeth/morris.js into no-grid
Conflicts:
morris.js
morris.min.js
2012-12-20 07:35:16 +00:00
Olly Smith
a23eb0792c
hoverCallback option.
2012-12-19 22:23:36 +00:00
Olly Smith
d308cb04be
Hover in bar charts.
2012-12-17 20:08:39 +00:00
Olly Smith
5a31deda53
Getting there... (for line charts, at least).
2012-12-14 22:31:31 +00:00
Marcin Chwedziak
849f7ee480
Ability to disable grid drawing in Line, Area, and Bar charts ( #114 )
2012-12-13 23:05:44 +01:00
Olly Smith
7ea84dda7f
Hover element for line charts (still needs refactoring...)
2012-12-13 19:09:50 +00:00
Olly Smith
77ee0468e6
WIP: connecting hover object to grid subclasses.
2012-12-11 22:00:22 +00:00
Olly Smith
8080000a56
Merge branch 'master' into html-hover
...
Conflicts:
lib/morris.line.coffee
morris.js
morris.min.js
2012-12-04 22:06:53 +00:00
Olly Smith
ff9856e8e9
Fix hover on broken lines.
2012-12-04 21:42:43 +00:00
Olly Smith
0068e54c4b
Fix createPath bug.
2012-12-04 21:31:13 +00:00
Olly Smith
e8c6ba89c8
WIP: re-organising.
2012-12-04 19:12:34 +00:00
Olly Smith
cf9d10b9dc
Merge branch 'master' into html-hover
...
Conflicts:
morris.min.js
2012-12-03 21:39:03 +00:00
Olly Smith
d41bea2e23
Refactor.
...
- Test paths as rendered in SVG.
- More exact unit tests for createPath.
- Catch some more edge case bugs in createPath.
- Refactor createPath to handle null values better.
2012-12-03 08:39:13 +00:00
Christopher Erin
b0e99f7ca9
default continuousLine to true for backwards compat
2012-11-29 16:34:04 -06:00
Christopher Erin
6d14aa831d
filled out tests for createPath and generatePaths. refactored code to allow for jagged/broken lines and to pass tests.
2012-11-29 16:28:27 -06:00
Christopher Erin
ee6cbd8eac
replace array.filter with list comprehension
2012-11-29 12:27:21 -06:00
