Robot/morris.js
1
0
Fork 0
mirror of https://github.com/morrisjs/morris.js.git synced 2024-11-14 07:41:11 +01:00
Code Issues Projects Releases Packages Wiki Activity
221 commits 4 branches 20 tags 3.3 MiB
Commit graph

221 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
5cbc34d912 Remove reference to old SVG file. 2013-01-24 15:49:06 -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
Olly Smith
18a4e8923a Merge pull request #166 from Radagaisus/patch-1 
Morris Fails to Compile with the Closure Compiler
 2013-01-24 13:03:59 -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
Pierre Dulac
1c81906dcd Update package grunt-less deprecated for the new grunt-contrib-less 
as suggested in the README
https://github.com/jharding/grunt-less/blob/master/README.md#grunt-less-deprecated
 2013-01-18 00:52: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
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
80e81894be add tests for svg output 2012-12-30 11:58:57 -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
8b06d9972d Merge pull request #134 from oesmith/html-hover 
Hover refactor (work in progress)
 2012-12-19 14:40:18 -08: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
Olly Smith
691bd8d017 Merge pull request #120 from dynaum/master 
Adding support to stacked bars
 2012-12-02 13:06:53 -08: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
Olly Smith
370edd2e2e Unit test stubs. 2012-11-29 08:18:14 +00:00
Elber Ribeiro
5c5e882c6b Adding new example file to staked bars 2012-11-26 14:47:36 -02:00
Elber Ribeiro
71bb498c05 generating min js 2012-11-20 10:51:26 -02:00
Elber Ribeiro
4773f909a8 Adding support to stacked bars 2012-11-19 23:23:11 -02:00