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
Evert Timberg
67bd2dae6d
Merge pull request #2145 from nnnick/fix/2110
...
Instead of showing a warning on load, throw an error on create if moment is not defined.
2016-03-16 20:08:15 -04:00
etimberg
998c6939bf
Instead of showing a warning on load, throw an error on create if moment is not defined.
2016-03-16 19:59:20 -04:00
Evert Timberg
2ab86f5557
Merge pull request #2144 from nnnick/fix/1942
...
Better conversion to ticks to make it easier to use callbacks
2016-03-16 19:44:10 -04:00
etimberg
21a33f0e41
Better conversion to ticks to make it easier to use callbacks
2016-03-16 19:39:09 -04:00
Evert Timberg
1157b19626
Merge pull request #2139 from nnnick/fix/2104
...
Fix zoom reset
2016-03-15 20:09:51 -04:00
Evert Timberg
04f1e57459
Fix zoom reset
2016-03-15 20:03:28 -04:00
Evert Timberg
1292558f7c
Merge pull request #2132 from nnnick/fix/2131
...
Fix axis IDs in documentation
2016-03-14 19:51:09 -04:00
Evert Timberg
f09f32f59e
Merge pull request #2133 from borancar/v2.0-dev
...
Add composer.json
2016-03-14 19:49:36 -04:00
Evert Timberg
bf724abe8b
Fix axis IDs in documentation
2016-03-14 19:43:21 -04:00
Boran Car
fffbc27db3
Add composer.json
2016-03-14 23:41:04 +00:00
Evert Timberg
e511fc2a1c
Merge pull request #2128 from The-Smallest/v2-rectangle-generic
...
Generic Rectangle: any border (botton, left, top, right) can be skipped now.
2016-03-13 14:06:31 -04:00
Evert Timberg
f64324e2a8
Merge pull request #2129 from nnnick/fix/2037
...
Fix animation bug.
2016-03-13 12:29:48 -04:00
Evert Timberg
4fec7dfdbb
Fix animation bug. Helpers.findNextWhere no longer returned the index of the item. This causes the wrong animation object to be removed.
2016-03-13 12:24:33 -04:00
Ivan Samoylenko
f5bb8e25d5
Fixed bar.controller tests
2016-03-13 19:10:49 +03:00
Ivan Samoylenko
81e1448836
Added 'borderSkipped' parameter to Rectangle.
2016-03-13 18:58:36 +03:00
Evert Timberg
d7117bc792
Add title of license to license file. Fixes #2097
2016-03-13 10:20:24 -04:00
Evert Timberg
cf767f71a2
Merge pull request #2093 from aaron-em/angleLineInterval
...
Add angleLineInterval option
2016-03-13 10:09:43 -04:00
