dibsyjr1
447801c45a
Returned Chart.js build file back to normal
2016-04-13 18:51:32 +01:00
dibsyjr1
5aa16a67c1
Fixed the generateLegend function
...
Fixed the generateLegend function to create the colour block next to the text instead of around it.
2016-04-13 16:03:08 +01:00
dibsyjr1
4b96572ac0
Fixed legendCallback() html generation
...
Fixed legendCallback's html generation so that the span lies next to the text instead of being around it.
2016-04-13 15:26:03 +01:00
Evert Timberg
3166895772
Merge pull request #2251 from tomduncalf/v2.0-handle-gradients
...
Allow gradients to be used as colors without causing errors when e.g. calling the color helper to generate the default colour value for hover
2016-04-13 07:05:19 -04:00
Tom Duncalf
0c854dd40c
Allow gradients to be used as colors without causing errors when e.g. calling the color helper to generate the defualt colour value for hover
2016-04-13 09:46:39 +01:00
Evert Timberg
87c8f51578
Merge pull request #2237 from troywarr/v2.0-dev
...
Fix "main" file path in bower.json
2016-04-10 20:15:34 -04:00
Troy Warr
5fa6003361
fix "main" file path in bower.json
2016-04-10 18:59:03 -05:00
Evert Timberg
00004fdd3b
Merge pull request #2234 from nnnick/fix/2223
...
Don't measure undefined or null strings.
2016-04-10 10:15:52 -04:00
Evert Timberg
68b493732c
Don't measure undefined or null strings.
2016-04-10 10:10:31 -04:00
Evert Timberg
e93677e0c8
Merge pull request #2233 from jamiepenney/v2.0-dev
...
Update Line chart documentation
2016-04-09 19:33:10 -04:00
Jamie Penney
8fca9540ab
Document the point radius setting
2016-04-10 11:15:55 +12:00
Jamie Penney
8c2bc34b9c
Fix whitespace in Line Chart documentation
2016-04-10 11:04:23 +12:00
etimberg
ebb8ca233d
Bump version to v2.0.0
2016-04-09 08:01:01 -04:00
etimberg
a62537a800
bump and build for 1.1.1 release
2016-04-05 18:27:27 -04:00
Evert Timberg
4495b63d0a
Merge pull request #2220 from TAGraves/master
...
Fixed a bug with calculating the canvas width and height
2016-04-05 09:47:25 -04:00
Tommy Graves
75ce567d05
Fixed a bug with calculating the canvas width and height
...
A previous commit removing a workaround for an old Firefox bug left part
of that workaround in, and it was preventing the expected behavior of
the canvas size being equal to the offsetWidth and offsetHeight of the
canvas prior to instantiation of Chart.JS
2016-04-05 08:28:46 -04:00
Evert Timberg
ae103c3d0f
Merge pull request #2218 from eemikula/master
...
Change legendTemplates to use separate spans for text and icon.
2016-04-04 19:49:03 -04:00
Eric Mikula
1ccb100739
Change legendTemplates to use separate spans for text and icon.
...
This addresses the issue in #2192 without entirely reverting #886 . Note that it still may cause confusing behavior for some legends: Specifically, the example on chartjs.org styles ".doughnut-legend li span" with a fixed width, and therefore both of the new spans will be impacted by this styling. However, now two spans are generated instead. %name%-legend-icon is used for the color icon, and %name%-legend-text can be used for styling the text. This should be described in release notes.
2016-04-04 18:22:25 -04:00
Evert Timberg
09efe9e6e2
Merge pull request #2214 from eemikula/master
...
Changing object type check to prevent errors when undefined. Fixes #2213
2016-04-03 15:33:12 -04:00
Eric Mikula
31b883f815
Changing object type check to prevent errors when undefined. Fixes #2213
2016-04-03 15:19:21 -04:00
Evert Timberg
6ba2efe3a4
Built files
2016-04-03 13:23:09 -04:00
Evert Timberg
d5fd737058
Merge pull request #2206 from nnnick/fix/constraint-width-percent
...
Allow percentages as the max-width/max-height of the container
2016-04-03 13:18:06 -04:00
Evert Timberg
93a2e9fc55
Merge pull request #2209 from nnnick/zoom_and_pan_pre_work
...
Zoom and pan pre work
2016-04-03 09:19:19 -04:00
Evert Timberg
a7fede4f46
Fix jshint error
2016-04-03 09:15:11 -04:00
Evert Timberg
488826ace3
Update doc file to indicate that category scale supports min/max attributes
2016-04-02 23:07:41 -04:00
Evert Timberg
9ee70d6d48
Category scale supports min / max
2016-04-02 23:05:48 -04:00
Evert Timberg
95bd0a54dd
Clip out the chart area so that things outside do not draw
2016-04-02 21:41:57 -04:00
Evert Timberg
2b361e1fee
Fix typo
2016-04-02 09:41:18 -04:00
Evert Timberg
7875b0c68d
Install latest chrome before running tests
2016-04-02 09:37:20 -04:00
Evert Timberg
5c1f242785
Use latest firefox version
2016-04-02 09:37:07 -04:00
Evert Timberg
3350d5fb13
Refactoring to reduce code size
2016-04-02 09:19:33 -04:00
Evert Timberg
b15b316e85
use watchify for incremental test rebuilds
2016-04-02 09:02:38 -04:00
Evert Timberg
b6d7ceba1c
Add initial implementation of constraint percentage width / height support. Added tests for dom sizing methods.
2016-04-01 23:11:01 -04:00
Evert Timberg
be6b254d50
Merge pull request #2203 from nnnick/fix/minor-doc-updates
...
Minor doc fixes
2016-04-01 22:16:05 -04:00
Evert Timberg
0b56ea452f
Minor doc fixes
2016-04-01 22:12:37 -04:00
Nick Downie
ef923dfe28
Update package + built files to 1.1.0 version
2016-04-01 17:03:30 +01:00
Evert Timberg
37da19df78
Merge pull request #2186 from nnnick/fix/2115
...
Better handling when data.datasets does not exist
2016-03-29 20:13:42 -04:00
etimberg
d8347039cf
Better handling when data.datasets does not exist
2016-03-29 20:10:29 -04:00
etimberg
3f73433831
Fixes #2185
...
Undoes the merge of #1334
2016-03-29 19:41:13 -04:00
Evert Timberg
f39fa53a7e
Fix doc titles
2016-03-26 10:57:43 -04:00
Evert Timberg
cefaef4707
Fix tests
2016-03-26 10:49:02 -04:00
Tanner Linsley
d4b6be5afe
Merge pull request #2173 from niemyjski/patch-1
...
Removed the default padding
2016-03-24 14:08:24 -05:00
Blake Niemyjski
798f643fab
Removed the default padding
...
You should put a style on the container element
2016-03-24 14:07:35 -05:00
etimberg
60a429f5cb
Update doc version
2016-03-23 19:22:43 -04:00
etimberg
f6cb3cf0ef
Updated build
2016-03-20 11:17:49 -04:00
Evert Timberg
f3926198d9
Merge pull request #2157 from nnnick/fix/2156
...
Fix scale merge when the xAxes object is specified but the type is not
2016-03-20 11:15:41 -04:00
etimberg
79f38b49d8
Fix scale merge when the xAxes object is specified but the type is not
2016-03-20 11:12:26 -04:00
Evert Timberg
9a0553a1b5
Update built files
2016-03-19 09:16:44 -04:00
Evert Timberg
74fd697351
Merge pull request #2155 from nnnick/fix/2154
...
Better use of default scale types.
2016-03-19 09:03:49 -04:00
Evert Timberg
e090691ef7
Better use of default scale types.
2016-03-19 08:50:50 -04:00