Commit graph

66 commits

Author SHA1 Message Date
Jelte Fennema
d54a039837 Merge pull request #460 from JelteF/horizontal-bar-fixes
Fix transX
2014-08-14 14:32:51 +02:00
Jelte Fennema
2901f63fba Fix transX 2014-07-15 18:24:20 +02:00
Jelte Fennema
0192dd0eee Pass series index to yLabelFormat 2014-07-15 17:55:56 +02:00
Jelte Fennema
a9076b2cc4 Merge pull request #452 from JelteF/feature-noshow 2014-07-15 15:45:22 +02:00
Jelte Fennema
715771431c Add horizontal barchart option 2014-07-14 00:15:21 +02:00
Jelte Fennema
877e341ac4 Add feature to not show certain plots, but still show values in the legend 2014-07-12 17:35:21 +02:00
Olly Smith
2df090ee48 Fix touch events. 2014-06-15 21:01:21 +01:00
Olly Smith
68aa4c36f2 Add original data to custom hover callback.
Chart data points are sorted when using parseTime, so indices will not
always match the original data ordering.

Also fixes a couple of event triggers.

Ref: #264.
2013-11-09 20:36:47 +00:00
Olly Smith
88e3fe6211 Automatic resizing.
Fixes #111. It's a costly operation, but it's working.
2013-11-09 19:33:36 +00:00
Olly Smith
6422b543be Merge branch 'feature/coffee_idioms' of https://github.com/sudodoki/morris.js into sudodoki-feature/coffee_idioms
Conflicts:
	lib/morris.grid.coffee
2013-11-09 17:50:53 +00:00
Alex Brinkman
b162e18cce Adds the ability to mark events on a non-time-based line graph 2013-11-03 20:58:17 -07:00
sudodoki
9162df9f62 some coffee idioms, common constructor change 2013-10-25 00:34:05 +03: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
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
Omar Khan
f659e94eac Use mouseleave instead of mouseout 2013-06-17 16:46:14 +01:00
Omar Khan
70dce01967 Remove unused Morris.Grid#updateHover method 2013-06-17 16:17:38 +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
05cdc7f3e4 Angled labels. 2013-05-09 22:15:05 +01:00
Marcin Chwedziak
c170062eae removed unnecessary object property set 2013-05-09 21:24:24 +02:00
Marcin Chwedziak
3960ecfcdb adds xLabelsDiagonal options, as asked in #235 2013-05-09 21:21:52 +02:00
Tomas Zulberti
143a9dbb77 Fomatted integer values
Solved issue #29
2013-04-17 15:53:55 -03:00
Olly Smith
96530d7576 Fix Y label sizing. 2013-04-14 09:13:31 +01: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
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
Olly Smith
5e240e64fe WIP: interval improvements 2013-03-29 11:48:24 -07:00
Olly Smith
4ecffd8d77 Ensure @width / @height are positive. 2013-03-14 21:43:59 +00:00
Olly Smith
6207c210ac Refactor / bugfix event and goal drawing. (fixes #181) 2013-02-08 08:06:02 +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
24306b8b00 Merge pull request #144 from chriserin/refactor_ybounds
break the ymin/ymax logic out into one method
2013-01-24 15:56:45 -08: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
Christopher Erin
4f70a38f1a break the ymin/ymax logic out into one method 2012-12-27 16:11:25 -06: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
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