]> git.ipfire.org Git - thirdparty/Chart.js.git/log
thirdparty/Chart.js.git
9 years agoScaled bar width fix 2326/head
John Walker [Fri, 22 Apr 2016 13:59:28 +0000 (14:59 +0100)] 
Scaled bar width fix

Add logic for calculating bar width when ticks are less than the data labels

9 years agoMerge pull request #2318 from Janpot/destroy-typo
Evert Timberg [Thu, 21 Apr 2016 15:47:20 +0000 (11:47 -0400)] 
Merge pull request #2318 from Janpot/destroy-typo

Fix typo in plugin 'destroy'

9 years agoFix typo in plugin 'destroy' 2318/head
Jan Potoms [Thu, 21 Apr 2016 15:25:37 +0000 (17:25 +0200)] 
Fix typo in plugin 'destroy'

9 years agoFix build and update to latest node js version.
Evert Timberg [Thu, 21 Apr 2016 11:50:20 +0000 (07:50 -0400)] 
Fix build and update to latest node js version.

9 years agoMerge pull request #2313 from zachpanz88/build-fix
Evert Timberg [Wed, 20 Apr 2016 23:47:24 +0000 (19:47 -0400)] 
Merge pull request #2313 from zachpanz88/build-fix

Fix case-sensitive error in gulpfile that caused builds to fail on linux

9 years agoFix case-sensitive error in gulpfile 2313/head
Zach Panzarino [Wed, 20 Apr 2016 23:42:07 +0000 (23:42 +0000)] 
Fix case-sensitive error in gulpfile

9 years agoMerge pull request #2310 from jachstet-sea/fix_Test
Evert Timberg [Wed, 20 Apr 2016 14:36:14 +0000 (10:36 -0400)] 
Merge pull request #2310 from jachstet-sea/fix_Test

Fix test/defaultConfig.tests.js after PR #2308

9 years agoFix test/defaultConfig.tests.js after PR #2308 2310/head
Jannis Achstetter [Wed, 20 Apr 2016 14:02:05 +0000 (16:02 +0200)] 
Fix test/defaultConfig.tests.js after PR #2308

9 years agoMerge pull request #2308 from pwavg/patch-1
Evert Timberg [Wed, 20 Apr 2016 13:26:40 +0000 (09:26 -0400)] 
Merge pull request #2308 from pwavg/patch-1

Fixed closing span position

9 years agoFixed closing span position 2308/head
Peter [Wed, 20 Apr 2016 11:55:58 +0000 (13:55 +0200)] 
Fixed closing span position

In the pie/doughnut legendCallback function the <span> is not closed immediately so that the text is written in the <span> instead of the <li>

9 years agoMerge pull request #2300 from HuwSy/patch-1
Evert Timberg [Tue, 19 Apr 2016 15:13:53 +0000 (11:13 -0400)] 
Merge pull request #2300 from HuwSy/patch-1

Fix tooltip example caretHeight to caretSize

9 years agoFix tooltip example caretHeight to caretSize 2300/head
Huw [Tue, 19 Apr 2016 14:59:13 +0000 (15:59 +0100)] 
Fix tooltip example caretHeight to caretSize

9 years agoMerge pull request #2293 from nnnick/docs/pie-doughnut-code-block
Evert Timberg [Mon, 18 Apr 2016 23:43:23 +0000 (19:43 -0400)] 
Merge pull request #2293 from nnnick/docs/pie-doughnut-code-block

Split Doughnut/Pie example usage into two code blocks

9 years agoSplit doughnut/pie example into two code block 2293/head
Nick Downie [Mon, 18 Apr 2016 21:30:10 +0000 (22:30 +0100)] 
Split doughnut/pie example into two code block

Odd change - but makes tempting the documentation a lot simpler

9 years agoMerge pull request #2289 from tKammy/fix_typo
Evert Timberg [Mon, 18 Apr 2016 16:43:01 +0000 (12:43 -0400)] 
Merge pull request #2289 from tKammy/fix_typo

Fix typo

9 years agofix typo 2289/head
Kammy [Mon, 18 Apr 2016 15:31:19 +0000 (00:31 +0900)] 
fix typo

9 years agoPlugin event in destroy
Evert Timberg [Sun, 17 Apr 2016 22:55:20 +0000 (18:55 -0400)] 
Plugin event in destroy

9 years agoBuilt files
Evert Timberg [Sun, 17 Apr 2016 18:40:18 +0000 (14:40 -0400)] 
Built files

9 years agoMerge pull request #2283 from nnnick/feature/plug-in-support
Evert Timberg [Sun, 17 Apr 2016 16:48:05 +0000 (12:48 -0400)] 
Merge pull request #2283 from nnnick/feature/plug-in-support

Adds support for plugins

9 years agoUpdate doc version # 2283/head
Evert Timberg [Sun, 17 Apr 2016 16:39:09 +0000 (12:39 -0400)] 
Update doc version #

9 years agoDocumentation for creating plugins
Evert Timberg [Sun, 17 Apr 2016 16:25:58 +0000 (12:25 -0400)] 
Documentation for creating plugins

9 years agoUse apply instead of call so that the animation easing can be passed to the draw...
Evert Timberg [Sun, 17 Apr 2016 16:25:47 +0000 (12:25 -0400)] 
Use apply instead of call so that the animation easing can be passed to the draw callbacks

9 years agoInitial plugin calls
Evert Timberg [Sun, 17 Apr 2016 16:02:42 +0000 (12:02 -0400)] 
Initial plugin calls

9 years agoPlugin system + tests
Evert Timberg [Sun, 17 Apr 2016 16:02:33 +0000 (12:02 -0400)] 
Plugin system + tests

9 years agoMerge pull request #2276 from nnnick/fix/2229
Evert Timberg [Sun, 17 Apr 2016 14:38:45 +0000 (10:38 -0400)] 
Merge pull request #2276 from nnnick/fix/2229

Improved sizing when grid lines are not display

9 years agoMore prework for zoom/pan
Evert Timberg [Sun, 17 Apr 2016 14:33:38 +0000 (10:33 -0400)] 
More prework for zoom/pan

9 years agoMerge pull request #2280 from nnnick/fix/2143
Evert Timberg [Sun, 17 Apr 2016 13:03:46 +0000 (09:03 -0400)] 
Merge pull request #2280 from nnnick/fix/2143

Update doughnut and polar area legend callbacks to handle when the background color is not set.

9 years agoFix tests 2280/head
Evert Timberg [Sun, 17 Apr 2016 12:54:27 +0000 (08:54 -0400)] 
Fix tests

9 years agoUpdate doughnut and polar area legend callbacks to handle when the background color...
Evert Timberg [Sun, 17 Apr 2016 12:38:46 +0000 (08:38 -0400)] 
Update doughnut and polar area legend callbacks to handle when the background color is not set.

9 years agoUpdate docs 2276/head
Evert Timberg [Sun, 17 Apr 2016 01:50:45 +0000 (21:50 -0400)] 
Update docs

9 years agoUpdate tests for new config option
Evert Timberg [Sun, 17 Apr 2016 01:49:08 +0000 (21:49 -0400)] 
Update tests for new config option

9 years agoAdd configurable tick mark length. Use it to calculate appropriate sizing
Evert Timberg [Sun, 17 Apr 2016 01:46:29 +0000 (21:46 -0400)] 
Add configurable tick mark length. Use it to calculate appropriate sizing

9 years agoRemove old doc files
Evert Timberg [Sun, 17 Apr 2016 01:13:44 +0000 (21:13 -0400)] 
Remove old doc files

9 years agoUpdate docs file for start angle and sweep properties
Evert Timberg [Sun, 17 Apr 2016 01:10:31 +0000 (21:10 -0400)] 
Update docs file for start angle and sweep properties

9 years agoRemove unnecessary line from code climate config
Evert Timberg [Sun, 17 Apr 2016 00:34:21 +0000 (20:34 -0400)] 
Remove unnecessary line from code climate config

9 years agoActual paths
Evert Timberg [Sun, 17 Apr 2016 00:21:14 +0000 (20:21 -0400)] 
Actual paths

9 years agoOnly rate files from src dir
Evert Timberg [Sun, 17 Apr 2016 00:10:33 +0000 (20:10 -0400)] 
Only rate files from src dir

9 years agoFix link
etimberg [Sun, 17 Apr 2016 00:06:36 +0000 (20:06 -0400)] 
Fix link

9 years agoMerge pull request #2275 from jsonmaur/patch-1
Tanner Linsley [Sat, 16 Apr 2016 23:58:01 +0000 (18:58 -0500)] 
Merge pull request #2275 from jsonmaur/patch-1

Update README.md

9 years agoUpdate README.md 2275/head
Jason Maurer [Sat, 16 Apr 2016 23:57:15 +0000 (17:57 -0600)] 
Update README.md

fixed the link :)

9 years ago2.0 Readme
Tanner Linsley [Sat, 16 Apr 2016 23:48:55 +0000 (18:48 -0500)] 
2.0 Readme

9 years agoMerge pull request #2274 from nnnick/v2.0-dev
Tanner Linsley [Sat, 16 Apr 2016 23:31:31 +0000 (18:31 -0500)] 
Merge pull request #2274 from nnnick/v2.0-dev

2.0.0 Release

9 years agoMerge pull request #2273 from mdehoog/doughnut-rotation 2272/head 2274/head
Evert Timberg [Sat, 16 Apr 2016 23:21:58 +0000 (19:21 -0400)] 
Merge pull request #2273 from mdehoog/doughnut-rotation

Added unit test for doughnut rotation/circumference, fix for rotation = 0

9 years agoFix for doughnut rotation = 0, added unit test for doughnut rotation/circumference... 2273/head
Michael de Hoog [Sat, 16 Apr 2016 23:16:42 +0000 (09:16 +1000)] 
Fix for doughnut rotation = 0, added unit test for doughnut rotation/circumference properties

9 years agoMerge branch 'master' into v2.0-dev
Tanner Linsley [Sat, 16 Apr 2016 23:13:23 +0000 (18:13 -0500)] 
Merge branch 'master' into v2.0-dev

9 years ago2.0.2 2.0.2
Tanner Linsley [Sat, 16 Apr 2016 22:39:51 +0000 (17:39 -0500)] 
2.0.2

9 years agoBetter default tick rotation and tick autoskip settings (#2258)
Tanner Linsley [Sat, 16 Apr 2016 22:38:03 +0000 (17:38 -0500)] 
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

9 years agoMerge pull request #2271 from mdehoog/doughnut-rotation
Evert Timberg [Sat, 16 Apr 2016 20:36:43 +0000 (16:36 -0400)] 
Merge pull request #2271 from mdehoog/doughnut-rotation

Add rotation and circumference properties to doughnut/pie charts

9 years agoBump and build for 2.0.1 v2.0.1
etimberg [Sat, 16 Apr 2016 18:22:45 +0000 (14:22 -0400)] 
Bump and build for 2.0.1

9 years agoAdded rotation and circumference properties to doughnut/pie charts 2271/head
Michael de Hoog [Sat, 16 Apr 2016 14:23:48 +0000 (00:23 +1000)] 
Added rotation and circumference properties to doughnut/pie charts

9 years agoMerge pull request #2264 from thukaramvh/tvenkat_bleeding_edge
Evert Timberg [Sat, 16 Apr 2016 12:44:19 +0000 (08:44 -0400)] 
Merge pull request #2264 from thukaramvh/tvenkat_bleeding_edge

Graph Index Data Labels display for Line Bar Graph for v2.0

9 years agoMerge pull request #2270 from nnnick/fix/travis-tests
Evert Timberg [Sat, 16 Apr 2016 12:42:49 +0000 (08:42 -0400)] 
Merge pull request #2270 from nnnick/fix/travis-tests

Fix/travis tests

9 years agoNewer ubuntu version 2270/head
Evert Timberg [Sat, 16 Apr 2016 12:28:33 +0000 (08:28 -0400)] 
Newer ubuntu version

9 years agotry a different travis config
Evert Timberg [Sat, 16 Apr 2016 12:24:18 +0000 (08:24 -0400)] 
try a different travis config

9 years agoOptimize animation frame requests (#2268)
Simon Brunel [Sat, 16 Apr 2016 00:15:54 +0000 (02:15 +0200)] 
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.

9 years agoMerge pull request #2255 from HarvestingClouds/patch-1 2167/head
Evert Timberg [Fri, 15 Apr 2016 10:13:54 +0000 (06:13 -0400)] 
Merge pull request #2255 from HarvestingClouds/patch-1

Using the dynamic absolute position even for relative elements

9 years agoMerge pull request #2263 from HarvestingClouds/patch-2
Evert Timberg [Fri, 15 Apr 2016 10:13:43 +0000 (06:13 -0400)] 
Merge pull request #2263 from HarvestingClouds/patch-2

Using the dynamic absolute position of the canvas, even for relative …

9 years agoData Labels display for Line Bar combo for v2.0 2264/head
Thukaram V H [Fri, 15 Apr 2016 04:57:58 +0000 (21:57 -0700)] 
Data Labels display for Line Bar combo for v2.0

Data Labels display for Line Bar combo for v2.0

9 years agoUsing the dynamic absolute position of the canvas, even for relative placement of... 2263/head
Aman Sharma [Fri, 15 Apr 2016 04:11:09 +0000 (00:11 -0400)] 
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.

9 years agoMerge pull request #2254 from dibsyjr1/v2.0-dev
Evert Timberg [Wed, 13 Apr 2016 19:27:04 +0000 (15:27 -0400)] 
Merge pull request #2254 from dibsyjr1/v2.0-dev

Fixed legendCallback() html generation

9 years agoUpdating to use the absolute position even if the chart canvas element is having... 2255/head
Aman Sharma [Wed, 13 Apr 2016 18:34:26 +0000 (14:34 -0400)] 
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

9 years agoReturned Chart.js build file back to normal 2254/head
dibsyjr1 [Wed, 13 Apr 2016 17:51:32 +0000 (18:51 +0100)] 
Returned Chart.js build file back to normal

9 years agoFixed the generateLegend function
dibsyjr1 [Wed, 13 Apr 2016 15:03:08 +0000 (16:03 +0100)] 
Fixed the generateLegend function

Fixed the generateLegend function to create the colour block next to the text instead of around it.

9 years agoFixed legendCallback() html generation
dibsyjr1 [Wed, 13 Apr 2016 14:26:03 +0000 (15:26 +0100)] 
Fixed legendCallback() html generation

Fixed legendCallback's html generation so that the span lies next to the text instead of being around it.

9 years agoMerge pull request #2251 from tomduncalf/v2.0-handle-gradients
Evert Timberg [Wed, 13 Apr 2016 11:05:19 +0000 (07:05 -0400)] 
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

9 years agoAllow gradients to be used as colors without causing errors when e.g. calling the... 2251/head
Tom Duncalf [Tue, 12 Apr 2016 15:36:56 +0000 (16:36 +0100)] 
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

9 years agoMerge pull request #2237 from troywarr/v2.0-dev
Evert Timberg [Mon, 11 Apr 2016 00:15:34 +0000 (20:15 -0400)] 
Merge pull request #2237 from troywarr/v2.0-dev

Fix "main" file path in bower.json

9 years agofix "main" file path in bower.json 2237/head
Troy Warr [Sun, 10 Apr 2016 23:59:03 +0000 (18:59 -0500)] 
fix "main" file path in bower.json

9 years agoMerge pull request #2234 from nnnick/fix/2223
Evert Timberg [Sun, 10 Apr 2016 14:15:52 +0000 (10:15 -0400)] 
Merge pull request #2234 from nnnick/fix/2223

Don't measure undefined or null strings.

9 years agoDon't measure undefined or null strings. 2234/head
Evert Timberg [Sun, 10 Apr 2016 14:10:31 +0000 (10:10 -0400)] 
Don't measure undefined or null strings.

9 years agoMerge pull request #2233 from jamiepenney/v2.0-dev
Evert Timberg [Sat, 9 Apr 2016 23:33:10 +0000 (19:33 -0400)] 
Merge pull request #2233 from jamiepenney/v2.0-dev

Update Line chart documentation

9 years agoDocument the point radius setting 2233/head
Jamie Penney [Sat, 9 Apr 2016 23:15:55 +0000 (11:15 +1200)] 
Document the point radius setting

9 years agoFix whitespace in Line Chart documentation
Jamie Penney [Sat, 9 Apr 2016 23:04:23 +0000 (11:04 +1200)] 
Fix whitespace in Line Chart documentation

9 years agoBump version to v2.0.0 v2.0.0
etimberg [Sat, 9 Apr 2016 12:01:01 +0000 (08:01 -0400)] 
Bump version to v2.0.0

9 years agobump and build for 1.1.1 release v1.1.1
etimberg [Tue, 5 Apr 2016 22:27:27 +0000 (18:27 -0400)] 
bump and build for 1.1.1 release

9 years agoMerge pull request #2220 from TAGraves/master
Evert Timberg [Tue, 5 Apr 2016 13:47:25 +0000 (09:47 -0400)] 
Merge pull request #2220 from TAGraves/master

Fixed a bug with calculating the canvas width and height

9 years agoFixed a bug with calculating the canvas width and height 2220/head
Tommy Graves [Tue, 5 Apr 2016 12:28:46 +0000 (08:28 -0400)] 
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

9 years agoMerge pull request #2218 from eemikula/master
Evert Timberg [Mon, 4 Apr 2016 23:49:03 +0000 (19:49 -0400)] 
Merge pull request #2218 from eemikula/master

Change legendTemplates to use separate spans for text and icon.

9 years agoChange legendTemplates to use separate spans for text and icon. 2218/head
Eric Mikula [Mon, 4 Apr 2016 22:22:25 +0000 (18:22 -0400)] 
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.

9 years agoMerge pull request #2214 from eemikula/master
Evert Timberg [Sun, 3 Apr 2016 19:33:12 +0000 (15:33 -0400)] 
Merge pull request #2214 from eemikula/master

Changing object type check to prevent errors when undefined. Fixes #2213

9 years agoChanging object type check to prevent errors when undefined. Fixes #2213 2214/head
Eric Mikula [Sun, 3 Apr 2016 19:19:21 +0000 (15:19 -0400)] 
Changing object type check to prevent errors when undefined. Fixes #2213

9 years agoBuilt files
Evert Timberg [Sun, 3 Apr 2016 17:23:09 +0000 (13:23 -0400)] 
Built files

9 years agoMerge pull request #2206 from nnnick/fix/constraint-width-percent
Evert Timberg [Sun, 3 Apr 2016 17:18:06 +0000 (13:18 -0400)] 
Merge pull request #2206 from nnnick/fix/constraint-width-percent

Allow percentages as the max-width/max-height of the container

9 years agoMerge pull request #2209 from nnnick/zoom_and_pan_pre_work
Evert Timberg [Sun, 3 Apr 2016 13:19:19 +0000 (09:19 -0400)] 
Merge pull request #2209 from nnnick/zoom_and_pan_pre_work

Zoom and pan pre work

9 years agoFix jshint error 2209/head
Evert Timberg [Sun, 3 Apr 2016 13:15:11 +0000 (09:15 -0400)] 
Fix jshint error

9 years agoUpdate doc file to indicate that category scale supports min/max attributes
Evert Timberg [Sun, 3 Apr 2016 03:07:41 +0000 (23:07 -0400)] 
Update doc file to indicate that category scale supports min/max attributes

9 years agoCategory scale supports min / max
Evert Timberg [Sun, 3 Apr 2016 03:05:48 +0000 (23:05 -0400)] 
Category scale supports min / max

9 years agoClip out the chart area so that things outside do not draw
Evert Timberg [Sun, 3 Apr 2016 01:41:57 +0000 (21:41 -0400)] 
Clip out the chart area so that things outside do not draw

9 years agoFix typo 2206/head
Evert Timberg [Sat, 2 Apr 2016 13:41:18 +0000 (09:41 -0400)] 
Fix typo

9 years agoInstall latest chrome before running tests
Evert Timberg [Sat, 2 Apr 2016 13:37:20 +0000 (09:37 -0400)] 
Install latest chrome before running tests

9 years agoUse latest firefox version
Evert Timberg [Sat, 2 Apr 2016 13:37:07 +0000 (09:37 -0400)] 
Use latest firefox version

9 years agoRefactoring to reduce code size
Evert Timberg [Sat, 2 Apr 2016 13:19:33 +0000 (09:19 -0400)] 
Refactoring to reduce code size

9 years agouse watchify for incremental test rebuilds
Evert Timberg [Sat, 2 Apr 2016 13:02:38 +0000 (09:02 -0400)] 
use watchify for incremental test rebuilds

9 years agoAdd initial implementation of constraint percentage width / height support. Added...
Evert Timberg [Sat, 2 Apr 2016 03:11:01 +0000 (23:11 -0400)] 
Add initial implementation of constraint percentage width / height support. Added tests for dom sizing methods.

9 years agoMerge pull request #2203 from nnnick/fix/minor-doc-updates
Evert Timberg [Sat, 2 Apr 2016 02:16:05 +0000 (22:16 -0400)] 
Merge pull request #2203 from nnnick/fix/minor-doc-updates

Minor doc fixes

9 years agoMinor doc fixes 2203/head
Evert Timberg [Sat, 2 Apr 2016 02:12:37 +0000 (22:12 -0400)] 
Minor doc fixes

9 years agoUpdate package + built files to 1.1.0 version v1.1.0
Nick Downie [Fri, 1 Apr 2016 16:03:30 +0000 (17:03 +0100)] 
Update package + built files to 1.1.0 version

9 years agoMerge pull request #2186 from nnnick/fix/2115
Evert Timberg [Wed, 30 Mar 2016 00:13:42 +0000 (20:13 -0400)] 
Merge pull request #2186 from nnnick/fix/2115

Better handling when data.datasets does not exist

9 years agoBetter handling when data.datasets does not exist 2186/head
etimberg [Wed, 30 Mar 2016 00:10:29 +0000 (20:10 -0400)] 
Better handling when data.datasets does not exist

9 years agoFixes #2185
etimberg [Tue, 29 Mar 2016 23:41:13 +0000 (19:41 -0400)] 
Fixes #2185
Undoes the merge of #1334