Robot/morris.js
1
0
Fork 0
mirror of https://github.com/morrisjs/morris.js.git synced 2024-11-10 21:36:34 +01:00
Code Issues Packages Projects Releases Wiki Activity
421 Commits 4 Branches 20 Tags 3.3 MiB
14530d0733
Commit Graph

209 Commits

Author SHA1 Message Date
Olly Smith
4346d98fdd Merge branch 'master' of https://github.com/mikach/morris.js 
Conflicts:
	morris.min.js
 2014-06-14 08:01:24 +01:00
Olly Smith
8f8aa35e3b (Finally) deprecate continuousLine option. 2014-05-05 21:38:39 +01:00
mikach
9532354320 Hide hover tooltip if empty 2014-04-03 19:37:57 +03:00
sudodoki
e3e50aac93 Implement #311: feature - bar max width 2014-01-30 01:57:57 +02:00
sudodoki
e8d84dca09 feature: configurable vertical segments 2013-11-16 01:53:37 +02:00
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
c07222445c setData() method for Morris.Donut. 
Fixes #211
 2013-11-09 19:53:50 +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
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
Olly Smith
4580852416 Merge pull request #306 from sudodoki/feature/xLabelPadding 
feature: option to set padding for x axis label
 2013-11-09 08:52:46 -08: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
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
sudodoki
9162df9f62 some coffee idioms, common constructor change 2013-10-25 00:34:05 +03:00
Olly Smith
7123d419a6 Merge branch 'master' of https://github.com/stlk/morris.js into stlk-master 
Conflicts:
	morris.min.js
 2013-10-12 14:02:06 +01:00
Olly Smith
0e8c0f49b6 Merge branch, and merge with previous changes. 
Previous point-width work by other contributors conflicted, so have tied
the two changes and sets of tests together. Have also slightly changed
some variable / config names to read easier.

Merge branch 'master' of https://github.com/dgilperez/morris.js into dgilperez-master

Conflicts:
	lib/morris.line.coffee
	morris.js
	morris.min.js
 2013-10-12 13:58:10 +01:00
Olly Smith
d889eb6268 Merge pull request #257 from mathieubigorne/master 
pointSize attribute should accept an array of values
 2013-10-12 05:35:34 -07: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
Olly Smith
e868701016 Merge branch 'range-selection' of https://github.com/arachnys/morris.js into arachnys-range-selection 
Conflicts:
	morris.min.js
 2013-10-12 13:27:35 +01:00
Olly Smith
019a04ed08 Merge branch 'label_specs_week' of https://github.com/dhoko/morris.js into dhoko-label_specs_week 
Conflicts:
	morris.min.js
 2013-10-12 13:24:09 +01:00
Josef Rousek
e31c466528 You can now specify segment color in data parameter 2013-09-11 14:37:32 +02:00
David Gil
8817e221b5 fix hilight WIP 2013-08-20 04:10:18 +02:00
David Gil
92d7790908 pointGrow and pointShrink must adapt to the point size position of the index 2013-08-20 04:06:07 +02:00
David Gil
f4478828e4 making point size customizable per line as well 2013-08-20 03:39:43 +02:00
David Gil
cdfe8ba62d add missing index 2013-08-20 02:55:44 +02:00
David Gil
c613aeb988 make line widths customizable 2013-08-20 02:38:48 +02:00
Taku AMANO
13af310795 Use the @options.smooth directly if the value's type is "boolean". 2013-07-30 10:39:25 +09:00
Mathieu Bigorne
ace9fafaa6 pointSizes accepts an array of value, one per serie 2013-07-02 12:10:25 +02: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
dhoko
b192a00d68 Add week in label_specs 2013-06-04 21:38:35 +02:00
Olly Smith
8493b6ec25 Fix hideHover (fixes #236). 2013-05-12 17:12:59 +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
feca1ecaeb Make event handlers chainable. 2013-05-10 07:41:09 +01:00
Olly Smith
e5c856fb10 Fix area chart fill colors for very light lines (fixes #190). 2013-05-10 07:40:51 +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
Olly Smith
8ae673e766 Merge pull request #224 from GranData/master 
Format X Label values
 2013-04-24 23:17:23 -07:00
wbond
a1c74d6a82 Fixes #186 - changed CSS top value for hover to be an int 2013-04-24 23:22:29 -04:00
Tomas Zulberti
143a9dbb77 Fomatted integer values 
Solved issue #29
 2013-04-17 15:53:55 -03:00
Olly Smith
67caadb600 Customizing hover content using default content (fixes #179). 2013-04-14 10:25:14 +01:00
Olly Smith
b9f53a8fdb Merge branch 'master' of github.com:oesmith/morris.js 
Conflicts:
	morris.min.js
 2013-04-14 09:18:28 +01:00
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