]> git.ipfire.org Git - thirdparty/Chart.js.git/log
thirdparty/Chart.js.git
10 years agoMerge pull request #1208 from etimberg/feature/v2.0-scale-refactor 1211/head 2.0.0-alpha2
Evert Timberg [Sat, 13 Jun 2015 21:51:17 +0000 (17:51 -0400)] 
Merge pull request #1208 from etimberg/feature/v2.0-scale-refactor

Radial scale improvements

10 years agoClean up of radial linear scale. Radar chart update function improvements 1208/head
Evert Timberg [Sat, 13 Jun 2015 21:45:59 +0000 (17:45 -0400)] 
Clean up of radial linear scale. Radar chart update function improvements

10 years agoFix typo in linear scale.
Evert Timberg [Sat, 13 Jun 2015 18:47:13 +0000 (14:47 -0400)] 
Fix typo in linear scale.

10 years agoMerge pull request #1207 from etimberg/feature/v2.0-scale-refactor
Evert Timberg [Sat, 13 Jun 2015 18:30:18 +0000 (14:30 -0400)] 
Merge pull request #1207 from etimberg/feature/v2.0-scale-refactor

Move more scale configs into the scale defaults.

10 years agoMove linearRadial default config to be a property of the scale. 1207/head
Evert Timberg [Sat, 13 Jun 2015 18:16:01 +0000 (14:16 -0400)] 
Move linearRadial default config to be a property of the scale.

10 years agoCreate linear scale default settings. Cleaned up unnecessary settings from bar, line...
Evert Timberg [Sat, 13 Jun 2015 17:57:55 +0000 (13:57 -0400)] 
Create linear scale default settings. Cleaned up unnecessary settings from bar, line, and scatter default configs. Removed unnecessary config options from the affected sample files

10 years agoMerge pull request #1206 from etimberg/feature/v2.0-scale-refactor
Evert Timberg [Sat, 13 Jun 2015 17:33:05 +0000 (13:33 -0400)] 
Merge pull request #1206 from etimberg/feature/v2.0-scale-refactor

Category scale now has defaults.

10 years agoCategory scale now has defaults. Updated the bar & line charts to use this new default. 1206/head
Evert Timberg [Sat, 13 Jun 2015 17:25:41 +0000 (13:25 -0400)] 
Category scale now has defaults. Updated the bar & line charts to use this new default.

10 years agoClone handles arrays better
Evert Timberg [Sat, 13 Jun 2015 17:22:28 +0000 (13:22 -0400)] 
Clone handles arrays better

10 years agoRemove some unused scale code
Evert Timberg [Sat, 13 Jun 2015 15:45:30 +0000 (11:45 -0400)] 
Remove some unused scale code

10 years agoChange spaces to tabs throughout
Evert Timberg [Sat, 13 Jun 2015 14:15:21 +0000 (10:15 -0400)] 
Change spaces to tabs throughout

10 years agoMerge pull request #1205 from etimberg/feature/v2.0-scale-refactor
Evert Timberg [Sat, 13 Jun 2015 14:01:06 +0000 (10:01 -0400)] 
Merge pull request #1205 from etimberg/feature/v2.0-scale-refactor

Move things into the radialLinear scale

10 years agoMerge `Chart.scales` into `Chart.scaleService` to be consistent 1205/head
Evert Timberg [Sat, 13 Jun 2015 13:55:43 +0000 (09:55 -0400)] 
Merge `Chart.scales` into `Chart.scaleService` to be consistent

10 years agoMove some of the radial linear scale functions into the radialLinear scale
Evert Timberg [Sat, 13 Jun 2015 13:51:28 +0000 (09:51 -0400)] 
Move some of the radial linear scale functions into the radialLinear scale

10 years agoMerge pull request #1204 from etimberg/feature/v2.0-scale-refactor
Evert Timberg [Sat, 13 Jun 2015 13:06:05 +0000 (09:06 -0400)] 
Merge pull request #1204 from etimberg/feature/v2.0-scale-refactor

Scatter chart derives from line chart

10 years agoHandle nesting better in the clone method so that we don't wipe out the line defaults... 1204/head
Evert Timberg [Sat, 13 Jun 2015 12:59:54 +0000 (08:59 -0400)] 
Handle nesting better in the clone method so that we don't wipe out the line defaults when the scatter chart extends

10 years agoScatter chart now extends the line chart.
Evert Timberg [Sat, 13 Jun 2015 12:46:49 +0000 (08:46 -0400)] 
Scatter chart now extends the line chart.

10 years agoMerge remote-tracking branch 'upstream/v2.0-dev' into feature/v2.0-scale-refactor
Evert Timberg [Sat, 13 Jun 2015 12:35:34 +0000 (08:35 -0400)] 
Merge remote-tracking branch 'upstream/v2.0-dev' into feature/v2.0-scale-refactor

10 years agoSupport jQuery' or native canvas element as chart context
Tanner Linsley [Sat, 13 Jun 2015 08:41:15 +0000 (02:41 -0600)] 
Support jQuery' or native canvas element as chart context

10 years agoReverse that :)
Tanner Linsley [Sat, 13 Jun 2015 08:13:38 +0000 (02:13 -0600)] 
Reverse that :)

10 years agoDo not update involuntarily on resize. Only render.
Tanner Linsley [Sat, 13 Jun 2015 08:08:55 +0000 (02:08 -0600)] 
Do not update involuntarily on resize.  Only render.

10 years agochart.bar - remove tooltip on mouseout
Tanner Linsley [Sat, 13 Jun 2015 06:45:43 +0000 (00:45 -0600)] 
chart.bar - remove tooltip on mouseout

10 years agoCategory Scale display false fixes
Tanner Linsley [Sat, 13 Jun 2015 06:30:42 +0000 (00:30 -0600)] 
Category Scale display false fixes

10 years agoMake the line and scatter charts almost identical. Next step is to merge them
Evert Timberg [Sat, 13 Jun 2015 02:35:48 +0000 (22:35 -0400)] 
Make the line and scatter charts almost identical. Next step is to merge them

10 years agoConvert line chart to tabs from spaces
Evert Timberg [Sat, 13 Jun 2015 02:07:07 +0000 (22:07 -0400)] 
Convert line chart to tabs from spaces

10 years agoMerge pull request #1202 from etimberg/feature/v2.0-scale-refactor
Evert Timberg [Sat, 13 Jun 2015 01:54:03 +0000 (21:54 -0400)] 
Merge pull request #1202 from etimberg/feature/v2.0-scale-refactor

Push some of the scatter scale information down to the linear scale.

10 years agoPush some of the scatter scale information down to the linear scale. 1202/head
Evert Timberg [Sat, 13 Jun 2015 01:46:47 +0000 (21:46 -0400)] 
Push some of the scatter scale information down to the linear scale.

10 years agoMerge pull request #1201 from etimberg/feature/v2.0-scale-refactor
Evert Timberg [Sat, 13 Jun 2015 01:22:06 +0000 (21:22 -0400)] 
Merge pull request #1201 from etimberg/feature/v2.0-scale-refactor

Move stacked options into scales. Can be configured independently for each axis

10 years agoRemoved unused options from the bar and line charts 1201/head
Evert Timberg [Sat, 13 Jun 2015 01:16:23 +0000 (21:16 -0400)] 
Removed unused options from the bar and line charts

10 years agoMove more data into the linear scale.This simplifies `buildScale` for line and bar...
Evert Timberg [Sat, 13 Jun 2015 01:15:15 +0000 (21:15 -0400)] 
Move more data into the linear scale.This simplifies `buildScale` for line and bar charts

10 years agoMove some functions into the category scale. This cleans up the bar chart interface...
Evert Timberg [Sat, 13 Jun 2015 00:50:26 +0000 (20:50 -0400)] 
Move some functions into the category scale. This cleans up the bar chart interface & allows for waterfall charts by settings `stacked` to false on the category axis but `stacked` to true on the y axis

10 years agoBar stacked sample
Evert Timberg [Fri, 12 Jun 2015 23:10:11 +0000 (19:10 -0400)] 
Bar stacked sample

10 years agoMerge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev
Tanner Linsley [Fri, 12 Jun 2015 22:39:32 +0000 (16:39 -0600)] 
Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev

10 years agoRename 'scaleType' property to 'type; throughout samples & code
Evert Timberg [Fri, 12 Jun 2015 22:24:51 +0000 (18:24 -0400)] 
Rename 'scaleType' property to 'type; throughout samples & code

10 years agoCategory Scale fixed
Tanner Linsley [Fri, 12 Jun 2015 22:18:20 +0000 (16:18 -0600)] 
Category Scale fixed

10 years agoFile structure fixes and gulp watch working again
Tanner Linsley [Fri, 12 Jun 2015 22:15:33 +0000 (16:15 -0600)] 
File structure fixes and gulp watch working again

10 years agoFile structure for extensibility
Tanner Linsley [Fri, 12 Jun 2015 22:08:27 +0000 (16:08 -0600)] 
File structure for extensibility

10 years agoFile structure fixes, Radar Chart tooltip fixes
Tanner Linsley [Fri, 12 Jun 2015 21:37:38 +0000 (15:37 -0600)] 
File structure fixes, Radar Chart tooltip fixes

10 years agoNo Logging
Tanner Linsley [Fri, 12 Jun 2015 21:28:50 +0000 (15:28 -0600)] 
No Logging

10 years agoHidden Scales Fixes
Tanner Linsley [Fri, 12 Jun 2015 21:28:30 +0000 (15:28 -0600)] 
Hidden Scales Fixes

10 years agoFile structure fixes
Tanner Linsley [Fri, 12 Jun 2015 20:48:20 +0000 (14:48 -0600)] 
File structure fixes

10 years agoMore maintainable file structure
Tanner Linsley [Fri, 12 Jun 2015 20:00:48 +0000 (14:00 -0600)] 
More maintainable file structure

10 years agoLine element custom override support
Tanner Linsley [Thu, 11 Jun 2015 16:04:08 +0000 (10:04 -0600)] 
Line element custom override support

10 years agoGulp build
Tanner Linsley [Thu, 11 Jun 2015 15:48:17 +0000 (09:48 -0600)] 
Gulp build

10 years agoMerge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev
Tanner Linsley [Thu, 11 Jun 2015 07:06:07 +0000 (01:06 -0600)] 
Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev

10 years agoHover states, Scale padding, and mouse out fixes
Tanner Linsley [Thu, 11 Jun 2015 07:05:44 +0000 (01:05 -0600)] 
Hover states, Scale padding, and mouse out fixes

10 years agoMerge pull request #1193 from etimberg/fix/scale-small-number-display
Evert Timberg [Thu, 11 Jun 2015 00:14:26 +0000 (20:14 -0400)] 
Merge pull request #1193 from etimberg/fix/scale-small-number-display

By default use toLocaleString() when generating labels for the axes. â€¦

10 years agoBy default use toLocaleString() when generating labels for the axes. This prevents... 1193/head
Evert Timberg [Thu, 11 Jun 2015 00:08:12 +0000 (20:08 -0400)] 
By default use toLocaleString() when generating labels for the axes. This prevents misformatted numbers due to doubles. It also makes large numbers nicer with commas by default.

10 years agoMerge pull request #1187 from etimberg/fix/config-merge-clone
Evert Timberg [Wed, 10 Jun 2015 00:36:44 +0000 (20:36 -0400)] 
Merge pull request #1187 from etimberg/fix/config-merge-clone

Fix an error when merging null config values

10 years agoMerge pull request #1186 from etimberg/fix/log10
Evert Timberg [Wed, 10 Jun 2015 00:36:23 +0000 (20:36 -0400)] 
Merge pull request #1186 from etimberg/fix/log10

Use a polyfill when Math.log10 does not exist

10 years agoMerge pull request #1180 from etimberg/fix/scale-zero-point
Evert Timberg [Wed, 10 Jun 2015 00:36:15 +0000 (20:36 -0400)] 
Merge pull request #1180 from etimberg/fix/scale-zero-point

Use the correct base for linear scales

10 years agoForgot that `typeof null === 'object'` 1187/head
Evert Timberg [Tue, 9 Jun 2015 22:43:33 +0000 (18:43 -0400)] 
Forgot that `typeof null === 'object'`
Added a check for this condition so that merge works correctly

10 years agoUse a polyfill when Math.log10 does not exist 1186/head
Evert Timberg [Tue, 9 Jun 2015 22:24:43 +0000 (18:24 -0400)] 
Use a polyfill when Math.log10 does not exist

10 years agoUse the correct base for linear scales. This gives the correct fill for lines and... 1180/head
Evert Timberg [Mon, 8 Jun 2015 23:03:47 +0000 (19:03 -0400)] 
Use the correct base for linear scales. This gives the correct fill for lines and animations start at the correct point

10 years agochart.update(animationDuration) support
Tanner Linsley [Mon, 8 Jun 2015 21:57:47 +0000 (15:57 -0600)] 
chart.update(animationDuration) support

10 years agoGulp build
Tanner Linsley [Mon, 8 Jun 2015 19:14:05 +0000 (13:14 -0600)] 
Gulp build

10 years agoClone in configMerge
Tanner Linsley [Mon, 8 Jun 2015 19:12:20 +0000 (13:12 -0600)] 
Clone in configMerge

10 years agoMerge branch 'etimberg-fix/polar-area-angle-fix' into v2.0-dev
Evert Timberg [Sun, 7 Jun 2015 13:48:31 +0000 (09:48 -0400)] 
Merge branch 'etimberg-fix/polar-area-angle-fix' into v2.0-dev

10 years agoMerge branch 'fix/polar-area-angle-fix' of https://github.com/etimberg/Chart.js into...
Evert Timberg [Sun, 7 Jun 2015 13:48:05 +0000 (09:48 -0400)] 
Merge branch 'fix/polar-area-angle-fix' of https://github.com/etimberg/Chart.js into etimberg-fix/polar-area-angle-fix

Conflicts:
src/Chart.Core.js

10 years agoMerge pull request #1169 from etimberg/fix/skip-data-type
Evert Timberg [Sun, 7 Jun 2015 13:38:17 +0000 (09:38 -0400)] 
Merge pull request #1169 from etimberg/fix/skip-data-type

Only skip when the data is null, not when it is not a number

10 years agoMerge pull request #1172 from etimberg/fix/scale-fit-updates
Tanner Linsley [Sat, 6 Jun 2015 19:13:24 +0000 (13:13 -0600)] 
Merge pull request #1172 from etimberg/fix/scale-fit-updates

Scale fit updates

10 years agoMake the angle calculations more robust. Also ensure that angles in polar area charts... 1173/head
Evert Timberg [Sat, 6 Jun 2015 15:06:40 +0000 (11:06 -0400)] 
Make the angle calculations more robust. Also ensure that angles in polar area charts are calculated similarly to angles in doughnut / pie charts

10 years agoChange the scale fitting code from 2 pass fit to a 2.5 pass fit. The fit function... 1172/head
Evert Timberg [Sat, 6 Jun 2015 13:27:03 +0000 (09:27 -0400)] 
Change the scale fitting code from 2 pass fit to a 2.5 pass fit. The fit function is now passed a margin object that contains the margins on the left, top, right, and bottom of the scale. This is useful to know if you can draw outside of the width. This is used by the dataset scale so that extra padding is only added for long labels if absolutely required. If there is unused space underneath the vertical axes, that space is used first.

10 years agoBring linear axis labels closer to the tick marks when in a horizontal configuration...
Evert Timberg [Sat, 6 Jun 2015 12:21:16 +0000 (08:21 -0400)] 
Bring linear axis labels closer to the tick marks when in a horizontal configuration. Reduced excess whitespace.

10 years agoSome improvements to the linear scale. Made the tick marks smaller (5px vs 10px)...
Evert Timberg [Sat, 6 Jun 2015 12:12:13 +0000 (08:12 -0400)] 
Some improvements to the linear scale. Made the tick marks smaller (5px vs 10px) and tightened up the drawing. Removed the use of maxWidth in ctx.fillText since that is not supported in Safari

10 years agoOnly skip when the data is null, not when it is not a number 1169/head
Evert Timberg [Fri, 5 Jun 2015 22:03:35 +0000 (18:03 -0400)] 
Only skip when the data is null, not when it is not a number

10 years agoMerge pull request #1164 from etimberg/fix/angle-calculation
Tanner Linsley [Thu, 4 Jun 2015 22:39:59 +0000 (16:39 -0600)] 
Merge pull request #1164 from etimberg/fix/angle-calculation

Fix the angle calculation for slice detection

10 years agoDoughnut/Pie Fixes
Tanner Linsley [Thu, 4 Jun 2015 22:39:05 +0000 (16:39 -0600)] 
Doughnut/Pie Fixes

10 years agoFix angle calculation in determining which arcs are underneath the event point 1164/head
Evert Timberg [Thu, 4 Jun 2015 22:31:44 +0000 (18:31 -0400)] 
Fix angle calculation in determining which arcs are underneath the event point

10 years agoGulp Build
Tanner Linsley [Thu, 4 Jun 2015 01:45:14 +0000 (19:45 -0600)] 
Gulp Build

10 years agoMerge pull request #1159 from etimberg/feature/v2.0dev-nestedConfig
Tanner Linsley [Thu, 4 Jun 2015 01:42:37 +0000 (19:42 -0600)] 
Merge pull request #1159 from etimberg/feature/v2.0dev-nestedConfig

Nested configs + major code refactors

10 years agoBar config cleanup + some initial docs 1159/head
Evert Timberg [Thu, 4 Jun 2015 00:55:17 +0000 (20:55 -0400)] 
Bar config cleanup + some initial docs

10 years agoMerge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart...
Evert Timberg [Thu, 4 Jun 2015 00:49:37 +0000 (20:49 -0400)] 
Merge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart.js into feature/v2.0dev-nestedConfig

10 years agoMissed some commas
Evert Timberg [Thu, 4 Jun 2015 00:49:22 +0000 (20:49 -0400)] 
Missed some commas

10 years agoDefault global responsive
Tanner Linsley [Thu, 4 Jun 2015 00:47:11 +0000 (18:47 -0600)] 
Default global responsive

10 years agoSome more line options
Evert Timberg [Thu, 4 Jun 2015 00:46:35 +0000 (20:46 -0400)] 
Some more line options

10 years agoAdditional fixes to line chart docs
Evert Timberg [Thu, 4 Jun 2015 00:33:50 +0000 (20:33 -0400)] 
Additional fixes to line chart docs

10 years agoCleaned up line docs a bit and remove unnecessary options
Evert Timberg [Thu, 4 Jun 2015 00:25:43 +0000 (20:25 -0400)] 
Cleaned up line docs a bit and remove unnecessary options

10 years agoCleaned up global config + documentation of global config options
Evert Timberg [Wed, 3 Jun 2015 23:54:34 +0000 (19:54 -0400)] 
Cleaned up global config + documentation of global config options

10 years agoReset elements for polar area chart
Evert Timberg [Wed, 3 Jun 2015 23:24:29 +0000 (19:24 -0400)] 
Reset elements for polar area chart

10 years agoReset elements for donut charts
Evert Timberg [Wed, 3 Jun 2015 23:16:42 +0000 (19:16 -0400)] 
Reset elements for donut charts

10 years agoMerge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart...
Evert Timberg [Wed, 3 Jun 2015 22:36:08 +0000 (18:36 -0400)] 
Merge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart.js into feature/v2.0dev-nestedConfig

10 years agoReset elements for bar charts. Bar multi axis demo also shows different colours for...
Evert Timberg [Wed, 3 Jun 2015 22:35:42 +0000 (18:35 -0400)] 
Reset elements for bar charts. Bar multi axis demo also shows different colours for each bar.

10 years agoDoughnut and polar hovering/clicking
Tanner Linsley [Wed, 3 Jun 2015 22:31:25 +0000 (16:31 -0600)] 
Doughnut and polar hovering/clicking

10 years agoNo playground
Tanner Linsley [Wed, 3 Jun 2015 21:25:28 +0000 (15:25 -0600)] 
No playground

10 years agoVersion bump 2.0.0-alpha
Tanner Linsley [Wed, 3 Jun 2015 21:25:18 +0000 (15:25 -0600)] 
Version bump 2.0.0-alpha

10 years agoexample fixes
Tanner Linsley [Wed, 3 Jun 2015 21:18:42 +0000 (15:18 -0600)] 
example fixes

10 years agoPolar Area
Tanner Linsley [Wed, 3 Jun 2015 20:45:40 +0000 (14:45 -0600)] 
Polar Area

10 years agoFix
Tanner Linsley [Wed, 3 Jun 2015 20:17:10 +0000 (14:17 -0600)] 
Fix

10 years agoPie Chart
Tanner Linsley [Wed, 3 Jun 2015 20:14:23 +0000 (14:14 -0600)] 
Pie Chart

10 years agoRadar Chart skipNull & bezier fixes
Tanner Linsley [Wed, 3 Jun 2015 18:05:04 +0000 (12:05 -0600)] 
Radar Chart skipNull & bezier fixes

10 years agoGet closer to having radar charts work. Some issues with the line & point drawing...
Evert Timberg [Wed, 3 Jun 2015 12:02:21 +0000 (08:02 -0400)] 
Get closer to having radar charts work. Some issues with the line & point drawing code.

10 years agoFix an issue with bar charts that are not stacked
Evert Timberg [Wed, 3 Jun 2015 11:57:50 +0000 (07:57 -0400)] 
Fix an issue with bar charts that are not stacked

10 years agoScatter tooltips
Evert Timberg [Wed, 3 Jun 2015 00:50:36 +0000 (20:50 -0400)] 
Scatter tooltips

10 years agoBind events in scatter chart
Evert Timberg [Wed, 3 Jun 2015 00:48:26 +0000 (20:48 -0400)] 
Bind events in scatter chart

10 years agoUpdate scatter chart. Still need to get tooltips working
Evert Timberg [Wed, 3 Jun 2015 00:44:24 +0000 (20:44 -0400)] 
Update scatter chart. Still need to get tooltips working

10 years agoMerge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart...
Evert Timberg [Wed, 3 Jun 2015 00:07:07 +0000 (20:07 -0400)] 
Merge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart.js into feature/v2.0dev-nestedConfig

10 years agoBetter animations when chart is first initialized.
Evert Timberg [Wed, 3 Jun 2015 00:06:50 +0000 (20:06 -0400)] 
Better animations when chart is first initialized.

10 years ago!bar borderWidth
Tanner Linsley [Tue, 2 Jun 2015 23:29:17 +0000 (17:29 -0600)] 
!bar borderWidth

10 years agono logging
Tanner Linsley [Tue, 2 Jun 2015 23:13:47 +0000 (17:13 -0600)] 
no logging