Robot/morris.js
1
0
Fork 0
mirror of https://github.com/morrisjs/morris.js.git synced 2024-11-11 05:46:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
321 Commits 4 Branches 20 Tags 3.3 MiB
c1e40c13f4
Commit Graph

39 Commits

Author SHA1 Message Date
Olly Smith
063957657c Add perceptual diffs. 
Uses perceptualdiff to catch regressions / changes in charts as they are
displayed by a browser (in this case, phantomjs).

Currently has exemplaries for basic line, area, bar and stacked bar
charts.
 2013-11-10 22:09:01 +00: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
221c83781d Tidy up. 
- The options namespace should stay flat - no nested config values.
- Used single array literal instead of chained Array.concats.
- Added default values to config defaults, instead of using default
  method arguments.
- Tweaked spec.
 2013-11-09 17:23:07 +00:00
Olly Smith
415476f7ca Merge branch 'feature/rounded_corners' of https://github.com/sudodoki/morris.js into sudodoki-feature/rounded_corners 2013-11-09 16:56:32 +00:00
sudodoki
c9820c2d44 it is actually only top padding 2013-10-26 00:49:14 +03:00
sudodoki
b79e0be820 feature: optional xAxisLabelPadding 2013-10-26 00:18:16 +03:00
sudodoki
ca371d112a feature: round-corners for bars in barchart 2013-10-25 23:54:18 +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
Olly Smith
8493b6ec25 Fix hideHover (fixes #236). 2013-05-12 17:12:59 +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
3960ecfcdb adds xLabelsDiagonal options, as asked in #235 2013-05-09 21:21:52 +02:00
Olly Smith
67caadb600 Customizing hover content using default content (fixes #179). 2013-04-14 10:25:14 +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
811dc87d8b Hide chart when setData is passed empty or null array. (Fixes #142) 2013-02-06 07:35:54 +00: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
Olly Smith
4f53479cf0 xLabelMargin optionx. 2012-12-20 19:15:33 +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
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
Marcin Chwedziak
849f7ee480 Ability to disable grid drawing in Line, Area, and Bar charts (#114) 2012-12-13 23:05:44 +01:00
Olly Smith
77ee0468e6 WIP: connecting hover object to grid subclasses. 2012-12-11 22:00:22 +00: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
e8c6ba89c8 WIP: re-organising. 2012-12-04 19:12:34 +00:00
Olly Smith
a8ca88e583 Merge branch 'morris-hover' of https://github.com/tiraeth/morris.js into html-hover 
Conflicts:
	lib/morris.bar.coffee
	morris.js
	morris.min.js
 2012-12-02 22:23:59 +00:00
Elber Ribeiro
4773f909a8 Adding support to stacked bars 2012-11-19 23:23:11 -02:00
Marcin Chwedziak
9bdabf1d0d first version of hover refactored to be 100% html 2012-11-18 20:02:46 +01:00
Olly Smith
236afa4003 Define bar colors with a function. 2012-11-06 08:18:19 +00:00
Olly Smith
d6b955af02 Tidy up use of "is/isnt null" using ? operator. 2012-11-06 07:48:29 +00:00
Olly Smith
b233059e8d Replace $.map with coffeescript for-loops. 2012-11-06 07:36:36 +00:00
Olly Smith
e4f4594fab Back-to-basics bar chart. 2012-10-31 21:58:26 +00:00
tiraeth
69f932d9e6 Morris.Bar + additional updates to Morris.Grid for bars handling 2012-10-31 20:38:09 +01:00