Commit Graph

17 Commits

Author SHA1 Message Date
Olly Smith
8f8aa35e3b (Finally) deprecate continuousLine option. 2014-05-05 21:38:39 +01:00
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
David Gil
c613aeb988 make line widths customizable 2013-08-20 02:38:48 +02:00
Mathieu Bigorne
ace9fafaa6 pointSizes accepts an array of value, one per serie 2013-07-02 12:10:25 +02:00
Christopher Erin
32b06226c2 draw functionality broken out into methods on each class 2012-12-31 12:09:38 -06: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
Christopher Erin
80e81894be add tests for svg output 2012-12-30 11:58:57 -06: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
0068e54c4b Fix createPath bug. 2012-12-04 21:31:13 +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
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
Olly Smith
370edd2e2e Unit test stubs. 2012-11-29 08:18:14 +00:00
Marcin Chwedziak
9bdabf1d0d first version of hover refactored to be 100% html 2012-11-18 20:02:46 +01:00
Olly Smith
e76f6c8e0a Loads more specs. 2012-10-25 18:51:30 +01:00
Olly Smith
5776c44d60 Improved support for empty charts. 2012-10-25 09:19:37 +01:00
Olly Smith
5ae2dfc478 Start building up the spec coverage. Fix hover label bug (yay, specs!) 2012-10-25 08:23:20 +01:00