Commit Graph

71 Commits

Author SHA1 Message Date
Olly Smith
d5b8071dbb WIP Refactor grid drawing into a base class. 2012-10-21 22:33:49 +01:00
Olly Smith
67fbc481aa Simplify! 2012-10-21 00:29:40 +01:00
Olly Smith
66461001b7 Merge branch 'smooth-per-series' of https://github.com/tiraeth/morris.js into tiraeth-smooth-per-series
Conflicts:
	morris.min.js
2012-10-20 23:55:23 +01:00
Olly Smith
1d4c7f0d65 Custom dateFormat for string x-values. #90 2012-10-19 10:20:22 +01:00
tiraeth
b8674f3869 fixed the code to use ykeys for smooth instead of seriesLabels 2012-10-15 23:16:00 +02:00
tiraeth
9773a697b3 added ability to set smooth parameter per series 2012-10-15 22:58:35 +02:00
Olly Smith
2fdf78c716 Slight tidy-up. 2012-10-13 10:16:56 +01:00
Sam Figueroa
528a205257 Add ability to customize point fill 2012-10-09 19:06:06 +02:00
Sam Figueroa
0d42a6f026 Add ability to customize points in a series 2012-10-09 17:27:15 +02:00
Olly Smith
7775332aeb Don't sort data when parseTime is false. Fixes #83. 2012-10-03 08:24:38 +01:00
Brian Sanders
2903d086c6 Morris.Line: separate generation of y-axis labels and hover text 2012-09-28 15:10:48 -04:00
Olly Smith
bd9f9d5580 Whoops! Fix the donut hover code. 2012-09-27 10:12:36 +01:00
Olly Smith
43019eeeaf Morris.Donut#select(idx) for selecting donut segments (ref #79). 2012-09-26 21:37:25 +01:00
Olly Smith
9bb723057f Merge branch 'master' of github.com:oesmith/morris.js
Conflicts:
	morris.min.js
2012-09-26 21:30:25 +01:00
Olly Smith
e0b406feee Don't go negative on ymin if ymin==ymax==0 (fix #80). 2012-09-26 21:29:42 +01:00
Olly Smith
a9b0e03b43 Cycle lineColors (#78)
Fixes crashes when number of series is larger than number of line colors.
2012-09-25 21:07:48 +01:00
Olly Smith
fbe3ce8201 Formatter option for donut values (#75). 2012-09-20 07:31:31 +01:00
Olly Smith
088233d8d2 Donut charts fix. 2012-09-15 23:18:16 +01:00
Olly Smith
4c045c30dd Some documentation tweaks. 2012-09-15 23:05:48 +01:00
Olly Smith
a1894707e1 Split source, tidy up a little. 2012-09-01 11:04:06 +01:00
Olly Smith
b299d5eb40 WIP: Donut charts. 2012-08-27 22:39:16 +01:00
Olly Smith
8d7522a2f0 Fixes #71. 2012-08-17 13:23:59 +01:00
Olly Smith
eacbc01149 Fix #66. 2012-07-03 07:34:42 +01:00
Olly Smith
67251e854b Merge branch 'master' of https://github.com/dump247/morris.js into dump247-master
Conflicts:
	morris.min.js
2012-06-26 07:51:46 +01:00
Olly Smith
07716fadd0 WIP Mocha tests. 2012-06-26 07:15:54 +01:00
Cory Thomas
df2925d9e8 Compiled coffee script and uglified 2012-06-18 14:09:27 -05:00
Olly Smith
68aca2cde4 Updating datasets.
Use setData() function to update dataset.
2012-06-10 18:28:36 +01:00
Olly Smith
acfec20bcf Make sure x-axis labels don't overflow.
Fixes #63.
2012-06-08 22:39:06 +01:00
Olly Smith
0015b28ef2 Tidy up decimal grids intervals a little. 2012-06-08 21:47:43 +01:00
Olly Smith
380cc5217a Merge branch 'decimal' of https://github.com/pelletier/morris.js into pelletier-decimal
Conflicts:
	morris.min.js
2012-06-08 21:42:10 +01:00
Olly Smith
79575dce97 Fix string values. 2012-06-08 21:37:27 +01:00
Olly Smith
aa67b1a305 Bugfix: zero value regression (#59). 2012-05-15 22:39:37 +01:00
Thomas Pelletier
e329928bdc Move the formatting into yLabelFormat.
In order to let the user to get rid of the precision, she can provide a custom
yLabelFormat funciton.
2012-05-14 11:10:50 +01:00
Thomas Pelletier
7def73fbf6 Compute the maxYLabelWith using the precision.
As I introduced the precision, the maxYLabelWith is not the width of the raw
value but the width of the formatted one.

As the computing the of maxYLabelWidth is done in calc(), I moved yInterval in
it because I need it to compute the precision. Also I think it makes more sense,
because the calc() method is supposed to "do any size-related calculations".
2012-05-14 11:03:12 +01:00
Thomas Pelletier
dbc114e060 Add simple support of decimal values on the y axis. 2012-05-14 10:52:47 +01:00
Olly Smith
942e121caa A deep copy is overkill here.
The only destructive change to the supplied data array is to change its
ordering, so a shallow copy is enough to avoid clobbering it.
2012-05-14 07:37:45 +01:00
Thomas Pelletier
2108baaf4e Add an error message if the graph placeholder isn't found. 2012-05-11 18:25:29 +01:00
Thomas Pelletier
c66a723acc Make a deep copy of the given data set. 2012-05-11 17:41:39 +01:00
Olly Smith
f13e9e838f Better support for non-continous data (see #53). 2012-05-10 07:35:24 +01:00
Olly Smith
fa8f8c60e5 A small refactor. 2012-04-05 20:04:19 +01:00
Jon Thornton
0079d307f3 Added 'preunits' options and renamed 'units' to 'postunits'. 'units' option will be fill 'postunits' automatically to preserve backwards compatibility. 2012-04-05 12:54:46 -05:00
Olly Smith
5e4191060c Fix old IE bugs (mostly in examples rather than library code!) 2012-04-04 22:07:09 +01:00
Olly Smith
e6e666469d Only use timezones when timezone info is specified.
(ie. when neither zulu time or an offset is included, use local time).

Add tests.
2012-04-04 21:39:59 +01:00
Olly Smith
870e0a649a Merge branch 'master' of https://github.com/littlebtc/morris.js into timezones
Conflicts:
	morris.coffee
	morris.js
	morris.min.js
2012-04-04 21:02:56 +01:00
Olly Smith
564126fbfa Merge xLabelFormat contributions by @jonthornton.
Rename `xLabelsFormat` -> `xLabelFormat` (grammatically better :))

Add note to example to recommend use of `xLabels` option when using
`xLabelFormat`.

Use $.extends rather than setting spec.fmt directly (avoids modifying
the globals).

Add a test.
2012-04-04 20:32:24 +01:00
Jon Thornton
57211d6db2 Added option to customize x-labels. 2012-04-03 11:31:59 -04:00
Olly Smith
e670a6dbee Add xLabels option to specify x-label intervals.
Clean up whitespace (hooray for Whitespace.tmbundle!).
2012-04-02 21:27:45 +01:00
Olly Smith
fc4ff279a5 Refactor x-axis labelling. 2012-04-01 22:29:37 +01:00
Hsiao-Ting Yu
970a813a5a Support ISO 8601 with time zone offsets 2012-04-01 01:19:40 +08:00
Olly Smith
18b4191093 Better ISO date support 2012-03-23 19:09:15 +00:00