Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-07 12:49:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,754 Commits 8 Branches 114 Tags 67 MiB
73610c00b4
Commit Graph

1754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tanner Linsley
67625063a3 2.0.2 2016-04-16 17:39:51 -05:00
Tanner Linsley
4f60eecc01 Better default tick rotation and tick autoskip settings (#2258) 
* Better default tick rotation and tick autoskip settings

* scale.time: Use ctx to measure label, and <= instead of < for unit fitting

* Test Changes

* Passing Tests with new defaults
 2016-04-16 17:38:03 -05:00
Evert Timberg
1be88df813 Merge pull request #2271 from mdehoog/doughnut-rotation 
Add rotation and circumference properties to doughnut/pie charts
 2016-04-16 16:36:43 -04:00
etimberg
5e8bfea53e Bump and build for 2.0.1 2016-04-16 14:22:45 -04:00
Michael de Hoog
d3a29967e2 Added rotation and circumference properties to doughnut/pie charts 2016-04-17 00:23:48 +10:00
Evert Timberg
39cf4cc474 Merge pull request #2264 from thukaramvh/tvenkat_bleeding_edge 
Graph Index Data Labels display for Line Bar Graph for v2.0
 2016-04-16 08:44:19 -04:00
Evert Timberg
72d03a08a6 Merge pull request #2270 from nnnick/fix/travis-tests 
Fix/travis tests
 2016-04-16 08:42:49 -04:00
Evert Timberg
7bff3387b7 Newer ubuntu version 2016-04-16 08:28:33 -04:00
Evert Timberg
0c32db7094 try a different travis config 2016-04-16 08:24:18 -04:00
Simon Brunel
5836c19ec5 Optimize animation frame requests (#2268) 
The animation service now keeps track of the active animation frame request and will skip new requests until the current one is executed. This can happen when processing mouse events, e.g. 'mousemove' and 'mouseout' events will trigger multiple renders.
 2016-04-15 20:15:54 -04:00
Evert Timberg
98a995dbd2 Merge pull request #2255 from HarvestingClouds/patch-1 
Using the dynamic absolute position even for relative elements
 2016-04-15 06:13:54 -04:00
Evert Timberg
fc74f98dd6 Merge pull request #2263 from HarvestingClouds/patch-2 
Using the dynamic absolute position of the canvas, even for relative …
 2016-04-15 06:13:43 -04:00
Thukaram V H
ac4a4bfd67 Data Labels display for Line Bar combo for v2.0 
Data Labels display for Line Bar combo for v2.0
 2016-04-14 21:57:58 -07:00
Aman Sharma
e251d06ef5 Using the dynamic absolute position of the canvas, even for relative placement of the chart 
This will work with both relative and absolute position for the chart and will apply the tooltips appropriately. I have tested in a normal context and then also using the chart in the second column of two column table i.e. in a different position on the screen. Without this, the default tooltips will appear at the same position no matter where the chart is placed. They will appear misplaced. The fix I have provided allows the tooltips to appear smoothly with the chart, no matter where it is placed on the web page.
 2016-04-15 00:11:09 -04:00
Evert Timberg
1232a91300 Merge pull request #2254 from dibsyjr1/v2.0-dev 
Fixed legendCallback() html generation
 2016-04-13 15:27:04 -04:00
Aman Sharma
69716a45d3 Updating to use the absolute position even if the chart canvas element is having relative position 
This will work with both relative and absolute position for the chart
 2016-04-13 14:34:26 -04:00
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