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
274 Commits 4 Branches 20 Tags 3.3 MiB
14d45161b4
Commit Graph

152 Commits

Author SHA1 Message Date
Omar Khan
14d45161b4 Compile js 2013-06-17 18:55:04 +01:00
Olly Smith
8493b6ec25 Fix hideHover (fixes #236). 2013-05-12 17:12:59 +01:00
Olly Smith
8bc716f820 Update internal data array when using setData (fixes #213). 2013-05-12 16:56:25 +01:00
Olly Smith
6220c40217 Add gridTextFamily and gridTextWeight options. 2013-05-12 16:25:06 +01:00
Olly Smith
feca1ecaeb Make event handlers chainable. 2013-05-10 07:41:09 +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
f857797684 Build 2013-04-25 07:31:39 +01:00
Olly Smith
67caadb600 Customizing hover content using default content (fixes #179). 2013-04-14 10:25:14 +01:00
Olly Smith
b9f53a8fdb Merge branch 'master' of github.com:oesmith/morris.js 
Conflicts:
	morris.min.js
 2013-04-14 09:18:28 +01:00
Olly Smith
96530d7576 Fix Y label sizing. 2013-04-14 09:13:31 +01:00
Marcin Chwedziak
a87c47296c fixes #217, quick merge please 2013-04-10 22:00:50 +02:00
Olly Smith
347533c8dd Fix defaults check. 2013-04-01 21:41:13 +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
Olly Smith
ee004b6c12 Merge branch '199-area' of https://github.com/tiraeth/morris.js 
Conflicts:
	morris.min.js
 2013-04-01 21:05:22 +01:00
Olly Smith
6d6e07b2aa Better automatic y-labelling. 2013-04-01 20:35:27 +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
5e240e64fe WIP: interval improvements 2013-03-29 11:48:24 -07:00
Olly Smith
4cab2bbabb Fix DST handling. 2013-03-14 22:08:19 +00:00
Olly Smith
8107d8d396 More tidying up donuts. 2013-02-24 17:52:35 +00:00
Olly Smith
a7a22532e3 parseFloat for donut values. 2013-02-24 17:20:17 +00:00
Olly Smith
6207c210ac Refactor / bugfix event and goal drawing. (fixes #181) 2013-02-08 08:06:02 +00:00
Olly Smith
49a7a02774 Donut label color - fixes #159. 2013-02-06 08:27:13 +00:00
Olly Smith
481401c3b7 No need to bail any more when initialising with no data. 2013-02-06 07:40:25 +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
541874b2ce Rebuild. 2013-01-24 16:28:29 -08: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
Olly Smith
d87c0ef8ae Rename strokeColor -> backgroundColor. 2013-01-24 15:38:49 -08:00
Olly Smith
2cce7c43de Merge branch 'master' of https://github.com/peteralaoui/morris.js into peteralaoui-master 
Conflicts:
	morris.min.js
 2013-01-24 15:34:04 -08:00
Pierre Dulac
1703eb54a9 Add a strokeColor options to the Donut class 
to be able to present the donut over another background than a white
one.
 2013-01-18 01:11:08 +01:00
tiraeth
2489c1a430 fixed hideHover=auto for line/area chart 2013-01-02 12:19:52 +01:00
m.chwedziak
889a2e8cda Click events for current oesmith/master 2012-12-31 12:02:14 +01:00
Olly Smith
4f53479cf0 xLabelMargin optionx. 2012-12-20 19:15:33 +00:00
Olly Smith
0662095c29 Reduce number of options on yLabelFormatter. 2012-12-20 08:05:24 +00:00
Olly Smith
ecabc8976b Merge branch 'issue-138' of github.com:tiraeth/morris.js 
Conflicts:
	lib/morris.grid.coffee
	morris.js
	morris.min.js
 2012-12-20 08:02:13 +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
a620eec75d Fix hover position for area charts. 2012-12-19 22:35:49 +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
Marcin Chwedziak
24f11c6497 removed .call() call - not needed 2012-12-13 22:41:03 +01:00
Marcin Chwedziak
381be72f61 non-invasive solution for #138, with mache:spec 2012-12-13 22:31:13 +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
e0691b93d3 Smarter hover placement. 2012-12-11 18:25:18 +00:00
Olly Smith
6787fa7cff WIP: HTML hover refactor. 
- Morris.Hover now encapsulates the hover object, with no graph-specific
  code.
- Tests for Morris.Hover.
- Add chai-jquery to test suite.
 2012-12-07 19:04:21 +00:00