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
213 Commits 4 Branches 20 Tags 3.3 MiB
d87c0ef8ae
Commit Graph

83 Commits

Author SHA1 Message Date
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
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