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
345 Commits 4 Branches 20 Tags 3.3 MiB
4346d98fdd
Commit Graph

158 Commits

Author SHA1 Message Date
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
5d9bf447c5 Remove unused argument. 2013-04-01 21:32:03 +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
4ecffd8d77 Ensure @width / @height are positive. 2013-03-14 21:43:59 +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
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
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
Olly Smith
1ecd8f95c9 Merge pull request #153 from tiraeth/fix-hide-hover 
Fixed hideHover=auto for line/area chart
 2013-01-24 13:04:36 -08:00
radagaisus
928e1a5b34 Morris Fails to Compile with the Closure Compiler 
So closure-compiler decided that `long` is a reserved JS keyword, even when
it's a property of an object (`this.long`). The fault is on
closure-compiler - it's not compliant with the specification,
- but it means that Morris will fail to build on every asset
system that uses the closure compiler.


To fix this I just changed `@long` inside Donut to `@is_long`.
 2013-01-18 17:29:38 +02: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
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
7848b49479 differentiate the r variable that stands for radius from the r variable that stands for raphael 2012-12-30 12:00:08 -06:00
Christopher Erin
4f70a38f1a break the ymin/ymax logic out into one method 2012-12-27 16:11:25 -06: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
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
ff9856e8e9 Fix hover on broken lines. 2012-12-04 21:42:43 +00:00
Olly Smith
0068e54c4b Fix createPath bug. 2012-12-04 21:31:13 +00:00
Olly Smith
e8c6ba89c8 WIP: re-organising. 2012-12-04 19:12:34 +00:00
Olly Smith
cf9d10b9dc Merge branch 'master' into html-hover 
Conflicts:
	morris.min.js
 2012-12-03 21:39:03 +00:00
Olly Smith
0bce4d3076 Merge branch 'broken-lines' 
Conflicts:
	morris.min.js
 2012-12-03 17:46:52 +00:00
Olly Smith
d41bea2e23 Refactor. 
- Test paths as rendered in SVG.
- More exact unit tests for createPath.
- Catch some more edge case bugs in createPath.
- Refactor createPath to handle null values better.
 2012-12-03 08:39:13 +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
Christopher Erin
b0e99f7ca9 default continuousLine to true for backwards compat 2012-11-29 16:34:04 -06:00
Christopher Erin
6d14aa831d filled out tests for createPath and generatePaths. refactored code to allow for jagged/broken lines and to pass tests. 2012-11-29 16:28:27 -06:00
Christopher Erin
ee6cbd8eac replace array.filter with list comprehension 2012-11-29 12:27:21 -06: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
Christopher Erin
10826cbfc0 discontinuous line in cases where null data values should be represented by no line rather than a line connecting only the coords with data. 2012-11-13 17:42:01 -06:00
Olly Smith
25698d6664 Decade intervals for time-axis labels. 2012-11-08 17:18:23 +00: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
Marcin Chwedziak
c279b9b0b1 fixes #107, passes data row to formatter function to allow user make usage of it 2012-11-05 19:55:08 +01:00
Olly Smith
8faced7668 Couple of quick fixes. 2012-11-03 14:08:57 +00:00
tiraeth
38a1cdd9ec Added value goals and time events. 2012-11-01 20:17:04 +01:00
Olly Smith
e4f4594fab Back-to-basics bar chart. 2012-10-31 21:58:26 +00:00
Olly Smith
5ee5ffe824 Revert paddings. 2012-10-31 20:14:39 +00:00
tiraeth
69f932d9e6 Morris.Bar + additional updates to Morris.Grid for bars handling 2012-10-31 20:38:09 +01:00
Olly Smith
5192f678dc *really* fix hover placing. 2012-10-28 21:22:10 +00:00
Olly Smith
a8d60d03fe Fix hover placing when nil values present. 2012-10-28 20:39:56 +00:00
Olly Smith
a03926897b Label x-axis from right to left. 2012-10-28 20:30:48 +00:00
Olly Smith
df63f19358 Reverse hover order for area charts. 2012-10-28 19:50:38 +00:00
Olly Smith
f72b14f619 Initial area charts. 2012-10-28 18:55:37 +00:00
Olly Smith
16b88ba1de Make hover a *teensy* bit clearer. 2012-10-27 18:31:21 +01:00
Olly Smith
5776c44d60 Improved support for empty charts. 2012-10-25 09:19:37 +01:00
Olly Smith
5ae2dfc478 Start building up the spec coverage. Fix hover label bug (yay, specs!) 2012-10-25 08:23:20 +01:00
Olly Smith
1aca098694 MUCH simpler internal code. 2012-10-23 09:15:21 +01:00
Olly Smith
f6b1cfe7a0 Line chart working again. 2012-10-22 07:56:40 +01:00
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
05d26c68e9 Remove debug code 2012-10-09 17:29:18 +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