Commit Graph

  • 89574b61c5 Prototype controller + some of line chart converted Evert Timberg 2015-06-13 20:40:35 -04:00
  • 253158cf1c Merge pull request #1208 from etimberg/feature/v2.0-scale-refactor 2.0.0-alpha2 Evert Timberg 2015-06-13 17:51:17 -04:00
  • 8c34bdbcd7 Clean up of radial linear scale. Radar chart update function improvements Evert Timberg 2015-06-13 17:45:59 -04:00
  • ecd3b58b28 Fix typo in linear scale. Evert Timberg 2015-06-13 14:47:13 -04:00
  • 41bac830c5 Merge pull request #1207 from etimberg/feature/v2.0-scale-refactor Evert Timberg 2015-06-13 14:30:18 -04:00
  • 47b25d1c6d Move linearRadial default config to be a property of the scale. Evert Timberg 2015-06-13 14:16:01 -04:00
  • 109de75c6a 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 Evert Timberg 2015-06-13 13:57:55 -04:00
  • 42856ec16a Merge pull request #1206 from etimberg/feature/v2.0-scale-refactor Evert Timberg 2015-06-13 13:33:05 -04:00
  • faa43d51a9 Category scale now has defaults. Updated the bar & line charts to use this new default. Evert Timberg 2015-06-13 13:25:41 -04:00
  • 3e4fce58fa Clone handles arrays better Evert Timberg 2015-06-13 13:22:28 -04:00
  • b0bddce017 Remove some unused scale code Evert Timberg 2015-06-13 11:45:30 -04:00
  • b5c69984e3 Change spaces to tabs throughout Evert Timberg 2015-06-13 10:15:21 -04:00
  • a8375d0459 Merge pull request #1205 from etimberg/feature/v2.0-scale-refactor Evert Timberg 2015-06-13 10:01:06 -04:00
  • 1f16b349d2 Merge Chart.scales into Chart.scaleService to be consistent Evert Timberg 2015-06-13 09:55:43 -04:00
  • 30019dfddd Move some of the radial linear scale functions into the radialLinear scale Evert Timberg 2015-06-13 09:51:28 -04:00
  • 61eea7f4a1 Merge pull request #1204 from etimberg/feature/v2.0-scale-refactor Evert Timberg 2015-06-13 09:06:05 -04:00
  • 6582e2ff06 Handle nesting better in the clone method so that we don't wipe out the line defaults when the scatter chart extends Evert Timberg 2015-06-13 08:59:54 -04:00
  • 8cfe21f6aa Scatter chart now extends the line chart. Evert Timberg 2015-06-13 08:46:49 -04:00
  • 6815fc451f Merge remote-tracking branch 'upstream/v2.0-dev' into feature/v2.0-scale-refactor Evert Timberg 2015-06-13 08:35:34 -04:00
  • 31643ee598 Support jQuery' or native canvas element as chart context Tanner Linsley 2015-06-13 02:41:15 -06:00
  • 1a3bb25f5c Reverse that :) Tanner Linsley 2015-06-13 02:13:38 -06:00
  • 181a61f16a Do not update involuntarily on resize. Only render. Tanner Linsley 2015-06-13 02:08:55 -06:00
  • 763bde9ed1 chart.bar - remove tooltip on mouseout Tanner Linsley 2015-06-13 00:45:43 -06:00
  • 0486db1e74 Category Scale display false fixes Tanner Linsley 2015-06-13 00:30:42 -06:00
  • 6185f156ea Make the line and scatter charts almost identical. Next step is to merge them Evert Timberg 2015-06-12 22:35:48 -04:00
  • d37e65c58c Convert line chart to tabs from spaces Evert Timberg 2015-06-12 22:07:07 -04:00
  • 43efda72d4 Merge pull request #1202 from etimberg/feature/v2.0-scale-refactor Evert Timberg 2015-06-12 21:54:03 -04:00
  • e55c0d4945 Push some of the scatter scale information down to the linear scale. Evert Timberg 2015-06-12 21:46:47 -04:00
  • a518833f96 Merge pull request #1201 from etimberg/feature/v2.0-scale-refactor Evert Timberg 2015-06-12 21:22:06 -04:00
  • 49fe78643a Removed unused options from the bar and line charts Evert Timberg 2015-06-12 21:16:23 -04:00
  • d2ef4c9831 Move more data into the linear scale.This simplifies buildScale for line and bar charts Evert Timberg 2015-06-12 21:15:15 -04:00
  • ec7b87d69c 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 Evert Timberg 2015-06-12 20:50:26 -04:00
  • 1e01e29f88 Bar stacked sample Evert Timberg 2015-06-12 19:10:11 -04:00
  • e9f206606d Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev Tanner Linsley 2015-06-12 16:39:32 -06:00
  • c5e4912319 Rename 'scaleType' property to 'type; throughout samples & code Evert Timberg 2015-06-12 18:24:51 -04:00
  • 63b7b18b17 Category Scale fixed Tanner Linsley 2015-06-12 16:18:20 -06:00
  • cfc008686b File structure fixes and gulp watch working again Tanner Linsley 2015-06-12 16:15:33 -06:00
  • e1237feb97 File structure for extensibility Tanner Linsley 2015-06-12 16:08:27 -06:00
  • cf88ec8333 File structure fixes, Radar Chart tooltip fixes Tanner Linsley 2015-06-12 15:37:38 -06:00
  • bba2dda59a No Logging Tanner Linsley 2015-06-12 15:28:50 -06:00
  • e2601f71e3 Hidden Scales Fixes Tanner Linsley 2015-06-12 15:28:30 -06:00
  • 195c794e5d File structure fixes Tanner Linsley 2015-06-12 14:48:20 -06:00
  • 5732e0d72a More maintainable file structure Tanner Linsley 2015-06-12 14:00:48 -06:00
  • 187163763e Line element custom override support Tanner Linsley 2015-06-11 10:04:08 -06:00
  • 15a32f4c78 Gulp build Tanner Linsley 2015-06-11 09:48:17 -06:00
  • a76640c409 Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev Tanner Linsley 2015-06-11 01:06:07 -06:00
  • 11773a5825 Hover states, Scale padding, and mouse out fixes Tanner Linsley 2015-06-11 01:05:44 -06:00
  • 65de784be1 Merge pull request #1193 from etimberg/fix/scale-small-number-display Evert Timberg 2015-06-10 20:14:26 -04:00
  • 55cf07926c 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. Evert Timberg 2015-06-10 20:08:12 -04:00
  • 3d389d7c09 Remove moot version property from bower.json Kevin Kirsche 2015-06-10 18:25:22 -04:00
  • 28d30b4f5b Added ignore section Maxime Veber 2015-06-10 22:32:23 +02:00
  • bd39534c2f Merge pull request #1187 from etimberg/fix/config-merge-clone Evert Timberg 2015-06-09 20:36:44 -04:00
  • 9dc63f0349 Merge pull request #1186 from etimberg/fix/log10 Evert Timberg 2015-06-09 20:36:23 -04:00
  • edd93f27ce Merge pull request #1180 from etimberg/fix/scale-zero-point Evert Timberg 2015-06-09 20:36:15 -04:00
  • 97a2232fbf Forgot that typeof null === 'object' Added a check for this condition so that merge works correctly Evert Timberg 2015-06-09 18:43:33 -04:00
  • 29743e1d63 Use a polyfill when Math.log10 does not exist Evert Timberg 2015-06-09 18:24:43 -04:00
  • d1cccd3546 Update CDN link paulmasson 2015-06-08 16:45:47 -07:00
  • 2bddccaaf0 Use the correct base for linear scales. This gives the correct fill for lines and animations start at the correct point Evert Timberg 2015-06-08 19:03:47 -04:00
  • 8f5d702a86 chart.update(animationDuration) support Tanner Linsley 2015-06-08 15:57:47 -06:00
  • 24d32e9321 Gulp build Tanner Linsley 2015-06-08 13:14:05 -06:00
  • 679fa4e72e Clone in configMerge Tanner Linsley 2015-06-08 13:12:20 -06:00
  • 9b4ebc3a05 Merge branch 'etimberg-fix/polar-area-angle-fix' into v2.0-dev Evert Timberg 2015-06-07 09:48:31 -04:00
  • 7d4ead51f7 Merge branch 'fix/polar-area-angle-fix' of https://github.com/etimberg/Chart.js into etimberg-fix/polar-area-angle-fix Evert Timberg 2015-06-07 09:48:05 -04:00
  • bcd834c084 Merge pull request #1169 from etimberg/fix/skip-data-type Evert Timberg 2015-06-07 09:38:17 -04:00
  • 593a1eacc8 Merge pull request #1172 from etimberg/fix/scale-fit-updates Tanner Linsley 2015-06-06 13:13:24 -06:00
  • d05d29aa66 Make the angle calculations more robust. Also ensure that angles in polar area charts are calculated similarly to angles in doughnut / pie charts Evert Timberg 2015-06-06 11:06:40 -04:00
  • 4a3a9f1a21 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. Evert Timberg 2015-06-06 09:27:03 -04:00
  • a89ede0d72 Bring linear axis labels closer to the tick marks when in a horizontal configuration. Reduced excess whitespace. Evert Timberg 2015-06-06 08:21:16 -04:00
  • 65ec618a48 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 Evert Timberg 2015-06-06 08:12:13 -04:00
  • e63d5a3367 Only skip when the data is null, not when it is not a number Evert Timberg 2015-06-05 18:03:35 -04:00
  • 5b5463b6f9 Merge pull request #1164 from etimberg/fix/angle-calculation Tanner Linsley 2015-06-04 16:39:59 -06:00
  • 205163641f Doughnut/Pie Fixes Tanner Linsley 2015-06-04 16:39:05 -06:00
  • 09eae7ff28 Fix angle calculation in determining which arcs are underneath the event point Evert Timberg 2015-06-04 18:31:44 -04:00
  • 669499ef1e Doughnut/Pie fixes v2.0-alpha Tanner Linsley 2015-06-04 16:17:06 -06:00
  • d46a174080 Gulp Build Tanner Linsley 2015-06-03 19:45:14 -06:00
  • 0c91bb96e0 Merge pull request #1159 from etimberg/feature/v2.0dev-nestedConfig Tanner Linsley 2015-06-03 19:42:37 -06:00
  • 9e9f436454 Bar config cleanup + some initial docs Evert Timberg 2015-06-03 20:55:17 -04:00
  • cbd2fef80f Merge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart.js into feature/v2.0dev-nestedConfig Evert Timberg 2015-06-03 20:49:37 -04:00
  • 996e471171 Missed some commas Evert Timberg 2015-06-03 20:49:22 -04:00
  • 70f7dd4c7d Default global responsive Tanner Linsley 2015-06-03 18:47:11 -06:00
  • 9c106aa8ff Some more line options Evert Timberg 2015-06-03 20:46:35 -04:00
  • 7dcee4b40e Additional fixes to line chart docs Evert Timberg 2015-06-03 20:33:50 -04:00
  • f12d1bcb56 Cleaned up line docs a bit and remove unnecessary options Evert Timberg 2015-06-03 20:25:43 -04:00
  • b9ab70f21b Cleaned up global config + documentation of global config options Evert Timberg 2015-06-03 19:54:34 -04:00
  • c2d6e4c31f Reset elements for polar area chart Evert Timberg 2015-06-03 19:24:29 -04:00
  • a6c712323f Reset elements for donut charts Evert Timberg 2015-06-03 19:16:42 -04:00
  • b93306788b Merge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart.js into feature/v2.0dev-nestedConfig Evert Timberg 2015-06-03 18:36:08 -04:00
  • 2a62e0e04d Reset elements for bar charts. Bar multi axis demo also shows different colours for each bar. Evert Timberg 2015-06-03 18:35:42 -04:00
  • 8e5d8b8861 Doughnut and polar hovering/clicking Tanner Linsley 2015-06-03 16:31:25 -06:00
  • 8b0b6194b2 No playground Tanner Linsley 2015-06-03 15:25:28 -06:00
  • 675a9f827e Version bump 2.0.0-alpha Tanner Linsley 2015-06-03 15:25:18 -06:00
  • 235247eb12 example fixes Tanner Linsley 2015-06-03 15:18:42 -06:00
  • b3b5896329 Polar Area Tanner Linsley 2015-06-03 14:45:40 -06:00
  • ecb1cde3fc Fix Tanner Linsley 2015-06-03 14:17:10 -06:00
  • 9be48a73ea Pie Chart Tanner Linsley 2015-06-03 14:14:23 -06:00
  • 7e791e02f2 Radar Chart skipNull & bezier fixes Tanner Linsley 2015-06-03 12:05:04 -06:00
  • 06d55e3501 Get closer to having radar charts work. Some issues with the line & point drawing code. Evert Timberg 2015-06-03 08:02:21 -04:00
  • 37cfbdb802 Fix an issue with bar charts that are not stacked Evert Timberg 2015-06-03 07:57:50 -04:00
  • 8d1a857e75 Scatter tooltips Evert Timberg 2015-06-02 20:50:36 -04:00
  • 42e2c237d4 Bind events in scatter chart Evert Timberg 2015-06-02 20:48:26 -04:00