Commit Graph

23 Commits

Author SHA1 Message Date
Marcin Chwedziak
a87c47296c fixes #217, quick merge please 2013-04-10 22:00:50 +02:00
Olly Smith
5d9bf447c5 Remove unused argument. 2013-04-01 21:32:03 +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
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
49a7a02774 Donut label color - fixes #159. 2013-02-06 08:27:13 +00: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
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
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
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
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
fbe3ce8201 Formatter option for donut values (#75). 2012-09-20 07:31:31 +01:00
Olly Smith
088233d8d2 Donut charts fix. 2012-09-15 23:18:16 +01:00
Olly Smith
4c045c30dd Some documentation tweaks. 2012-09-15 23:05:48 +01:00
Olly Smith
a1894707e1 Split source, tidy up a little. 2012-09-01 11:04:06 +01:00