Commit Graph

44 Commits

Author SHA1 Message Date
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
Olly Smith
b3ab944aa8 Fix bug with single value in non time-series graphs. 2012-03-23 18:54:13 +00:00
Olly Smith
bde431ac34 Merge prettifylabels() into commas().
Stop parsing times for labels when @options.parseTime is false.

Tweak examples to show partial data series support.
2012-03-18 19:50:40 +00:00
Olly Smith
ad8d0b6a8c Refactor redraw() 2012-03-18 19:10:20 +00:00
Olly Smith
64cfa4a0ff Merge branch 'partialseries' of https://github.com/tangerilli/morris.js into tangerilli-partialseries 2012-03-18 18:24:06 +00:00
Olly Smith
ca5675954f Timestamp support. 2012-03-15 21:44:55 +00:00
Olly Smith
8261dd1e9a YYYY-MM-DD HH:MM[:SS[.SSS]] support. 2012-03-15 21:18:39 +00:00
Olly Smith
144092128c Timestamp refactor, 2/2. 2012-03-15 21:06:21 +00:00
Olly Smith
d8564ab251 Timestamp refactor, 1/2. 2012-03-15 20:47:15 +00:00
Olly Smith
634179d9e8 Better decimal number support. 2012-03-15 20:18:33 +00:00
Tony Angerilli
82a508f341 Various changes to allow for x-series data that is not complete (i.e. a series with fewer data points than another series) 2012-03-10 23:42:04 -08:00
Olly Smith
bcc034e152 Units labels. Fix commas for negative hundreds. 2012-03-08 20:50:43 +00:00
Olly Smith
4fb43d5d37 Support for negative numbers. 2012-03-08 20:03:45 +00:00
Olly Smith
28cb48bb36 Coffeescript non-date X values. 2012-03-06 22:05:25 +00:00
Olly Smith
35b46d15aa hideHover in coffeescript 2012-03-06 22:05:25 +00:00
Mark Abbott
b67c1b2358 Fixed bug where number of weeks was miscalculated 2012-03-04 17:03:11 +00:00
Mark Abbott
6fb708acea Added extra comments to the Coffeescript to describe the calculations that are going on 2012-03-04 17:01:09 +00:00
Mark Abbott
6be7b1904c Converted draft code to Coffeescript, and added calculation for number of weeks in the year 2012-03-04 16:11:48 +00:00
Olly Smith
8446be205e Move jQuery wrapper into coffeescript. 2012-03-01 08:06:38 +00:00
Olly Smith
eca4b3aba1 Sort input data (closes #10, #20). 2012-02-29 20:53:53 +00:00
Olly Smith
b3b8377c53 Fix bug when options.data.length == 2.
Closes #19
2012-02-29 08:11:01 +00:00
Olly Smith
0453724887 Accept DOM element in options.element (closes #11). 2012-02-28 22:00:08 +00:00
Olly Smith
dc0a34dcbb Refactor path drawing. 2012-02-28 21:27:33 +00:00
Olly Smith
8da7935d8e Merge branch 'master' of https://github.com/scockram/morris.js into scockram-master 2012-02-28 21:15:31 +00:00
Olly Smith
7a72eb3ed3 Simplify $.extend call. 2012-02-28 21:06:55 +00:00
Steve Cockram
3371209ab8 Added option to draw straight lines 2012-02-28 13:30:52 +00:00
Mickele Moriconi
d059c3acaf Clone @default options object before merging it 2012-02-28 13:12:46 +01:00
Olly Smith
8d6cb3ee8e Add ymax 'auto $min' support. 2012-02-28 08:20:41 +00:00
Emil Loer
3b4934003e add option to set maximum y value 2012-02-28 00:25:53 +01:00
Olly Smith
99aafd3ed8 Add minified build output. Make 'new' optional on Morris.Line. 2012-02-26 00:28:58 +00:00
Olly Smith
40f336e8bc Fix date-parsing bug. 2012-02-26 00:11:29 +00:00
Olly Smith
9350b63d18 Add YYYY-MM-DD support. 2012-02-23 22:27:26 +00:00
Olly Smith
b8302f24b9 Roughly complete coffeescript port. Still ugly though. 2012-02-23 21:59:45 +00:00
Olly Smith
0514145522 Add a vim modeline so I don't go crazy if I edit something at work. 2012-02-23 08:16:42 +00:00
Olly Smith
f729b1530a CoffeeScript re-write. Has a working plot, but so far no hover labels. 2012-02-23 08:11:31 +00:00