Commit Graph

  • b22e1e3e9c Update scatter chart. Still need to get tooltips working Evert Timberg 2015-06-02 20:44:24 -04:00
  • 635ec58616 Merge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart.js into feature/v2.0dev-nestedConfig Evert Timberg 2015-06-02 20:07:07 -04:00
  • f44dd06826 Better animations when chart is first initialized. Evert Timberg 2015-06-02 20:06:50 -04:00
  • 02d7442e4f !bar borderWidth Tanner Linsley 2015-06-02 17:29:17 -06:00
  • 4ded634d75 no logging Tanner Linsley 2015-06-02 17:13:47 -06:00
  • 80a25af502 Merge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart.js into feature/v2.0dev-nestedConfig Evert Timberg 2015-06-02 18:55:41 -04:00
  • 9b2d2efc7a Animation on refresh Evert Timberg 2015-06-02 18:54:18 -04:00
  • 6b0e609935 Bar Chart Stacked nestedConfig Tanner Linsley 2015-06-02 16:48:39 -06:00
  • 74d3890ba9 no legend yet... :( Tanner Linsley 2015-06-02 15:14:51 -06:00
  • df4d2d2594 Stroked tooltip colors Tanner Linsley 2015-06-02 15:14:06 -06:00
  • b7dc2339f4 line: skipNull functionality Tanner Linsley 2015-06-02 13:42:09 -06:00
  • edbb235668 Tooltip titles now work in the line chart. Getting ever closer to being done Evert Timberg 2015-05-31 20:16:04 -04:00
  • 92776ce0ac Animations & tool tips show. The title is not correct yet. Evert Timberg 2015-05-31 16:55:17 -04:00
  • e48c7f168b Add back line fill option. This is set on a per dataset basis, but there is an override in the config. Demo this in the line sample. Evert Timberg 2015-05-31 10:24:53 -04:00
  • 8a550852da Check in work from floobits with minor changes to fix some errors Evert Timberg 2015-05-31 09:47:10 -04:00
  • 8db79ae365 nnnick/Chart.js#1140: Watch sample folder kirkstrobeck 2015-05-27 18:28:45 -07:00
  • 8ef3aaa87d Add livereload to Gulp task kirkstrobeck 2015-05-27 18:07:01 -07:00
  • 6af94298ec Radar Chart Tanner Linsley 2015-05-27 10:28:00 -06:00
  • 1163efbcca Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev Tanner Linsley 2015-05-26 22:06:20 -06:00
  • 3a32144d89 Polar Area deep data Tanner Linsley 2015-05-26 22:02:41 -06:00
  • e3519f5bd4 More nested config stuff. Not sure what all of the options in the line config do, but left them in. Ensured that tooltips work. Evert Timberg 2015-05-26 21:16:18 -04:00
  • 7d8b1712a7 Convert bar chart to use nested config. Noticed that the segmentShowStroke option wasn't used at all. Evert Timberg 2015-05-26 19:30:34 -04:00
  • 54b51038ca Updated bar chart to use new nested config for bars. Removed unused relativeBars option. barBorderWidth was not used, but seems useful so we will keep it until later refactoring. Evert Timberg 2015-05-26 19:11:05 -04:00
  • e774a893da Use new animation options in the animation service. Evert Timberg 2015-05-26 18:54:36 -04:00
  • b03a057a76 Nested globals Tanner Linsley 2015-05-26 16:52:16 -06:00
  • 48dd1cf024 Merge pull request #1132 from etimberg/feature/v2.0dev-xy Tanner Linsley 2015-05-26 16:26:52 -06:00
  • a2d477ac5e Moved radial scale into Chat.Scale.js. Registered as "radialLinear" which will allow radialLogarithmic, etc in the future. Updated the polar area and radar charts to use the new scale config. The scales draw, but the points do not. This is no different than the current v2.0 branch Evert Timberg 2015-05-24 14:33:12 -04:00
  • 1352dfeb0f Fix the y scales that were missed in the previous check in Evert Timberg 2015-05-23 21:49:01 -04:00
  • d4e7765a50 Clean up some unused config options. Renamed 'show' to 'display' for scales since that was clearer and maintains backwards compatibility. Evert Timberg 2015-05-23 21:44:50 -04:00
  • 73b579c962 Remove old linear scale Evert Timberg 2015-05-23 21:21:40 -04:00
  • b67afcd727 Bar chart converted to new scale system. Added bar chart multi axis sample. Evert Timberg 2015-05-23 18:26:34 -04:00
  • a10e245e5a Use correct tooltip events in each chart Evert Timberg 2015-05-23 18:15:57 -04:00
  • 181e866175 Fix line chart multi axis sample title Evert Timberg 2015-05-23 17:50:27 -04:00
  • d998c803d3 Move line chart over to use new scale config. This adds support for multiple y axes. Added an example demonstrating this. Evert Timberg 2015-05-23 15:19:30 -04:00
  • a559ab85cd Ensure consistency in the helpers.toRadians name Evert Timberg 2015-05-23 15:18:33 -04:00
  • c66edc9169 dataset axis to be used in the line chart and the bar chart Evert Timberg 2015-05-23 15:18:08 -04:00
  • b7606c7a8d Rename onHover to events to match the line chart Evert Timberg 2015-05-23 15:15:04 -04:00
  • e093fdf572 Merge pull request #1127 from leighquince/fix/radar-datasetfill-option Evert Timberg 2015-05-20 17:54:17 -04:00
  • 73b0d587ba fix for radar chart ignoring datasetFill option Leigh Quince 2015-05-20 21:43:29 +02:00
  • 12e2ace039 Merge remote-tracking branch 'upstream/v2.0-dev' into feature/v2.0dev-xy Evert Timberg 2015-05-20 09:03:22 -04:00
  • ed4b9945f8 Initial dataset scale class Evert Timberg 2015-05-20 08:33:26 -04:00
  • 951e714e77 Playground and big changes Tanner Linsley 2015-05-20 00:03:45 -07:00
  • 008bb1aab3 Set new tooltip templates for the scatter chart Evert Timberg 2015-05-19 20:33:39 -04:00
  • 4cc24d475a Clean up the scale service. It's now more of a helper function for fitting the scales. Since each chart needed to know it's scales, there wasn't much point in registering them into the service. When we support overlapping charts, we can do something fancier Evert Timberg 2015-05-19 18:22:05 -04:00
  • 4b8c9bc30d Fix a drawing bug when drawTicks is false. etimberg 2015-05-18 20:59:21 -04:00
  • 978ed1bc1e Created a multi axis sample file. Added an option to draw ticks for the axes. This is useful when in a multi axis scenario so that the axis that does not draw grid lines does not have weird lines. etimberg 2015-05-18 20:39:59 -04:00
  • 676765e808 Initial config merge. Handles special cases for objects and arrays and merges smarter than simply replacing the default object. Tested by overriding the vertical axis 0 point colour. Also implemented dataset axis binding. If nothing is specified, the dataset is bound to the first x and y axis. etimberg 2015-05-18 14:19:34 -04:00
  • f2065265c8 Fix an error in the scale service that prevented the chart from filling the canvas fully. Evert Timberg 2015-05-18 10:27:39 -04:00
  • a6e2eec9e0 Linear scale drawing improvements. Ensured that the scatter plot configuration has a different line colour for the 0 axis Evert Timberg 2015-05-18 09:39:01 -04:00
  • 2e383da0d8 Handle the beginAtZero option for a linear scale. Added a helper for Math.sign Evert Timberg 2015-05-18 08:51:13 -04:00
  • e30a9d2a94 The scatter example page now has negative numbers in both directions Evert Timberg 2015-05-18 08:44:06 -04:00
  • 492292e94b Remove x label rotation code since we dynamically adjust the number of labels to show and as such do not need to rotate Evert Timberg 2015-05-18 08:43:38 -04:00
  • 454f519b6d Fix jshint warnings Evert Timberg 2015-05-18 08:27:18 -04:00
  • 56d53e3ad4 Ensure that you always have at least 2 ticks on the linear axis Evert Timberg 2015-05-17 13:29:17 -04:00
  • 67b3d32218 Initial implementation of a scatter chart. Uses a new style of config from the other charts. For now, the config is not changeable. Evert Timberg 2015-05-17 13:20:37 -04:00
  • d7ad5b6340 Add a scatter chart sample Evert Timberg 2015-05-17 13:19:37 -04:00
  • db1365c8ce Initial check in of the scale service and the scale constructor registration. An initial implementation of a linear scale that can be drawn in both horizontal and vertical orientations. Evert Timberg 2015-05-16 19:40:52 -04:00
  • b5b0081108 Some helper functions needed for better scales. Evert Timberg 2015-05-16 19:38:31 -04:00
  • 2ce4291e98 Merge pull request #1122 from ismeta/fix-span-tag Evert Timberg 2015-05-16 08:37:38 -04:00
  • 598a6f3485 Fixes #886 - Close span tags properly in legend generation template. Vanessa Ung 2015-05-16 15:31:56 +10:00
  • fff81c455d Tooltip Position, Active Element Position, Tooltip animation follow Tanner Linsley 2015-05-15 23:07:21 -06:00
  • ad972a0c5c Pie cleanup. Tanner Linsley 2015-05-15 22:45:17 -06:00
  • 872c92cd4b Doughnut/Pie Chart refactor Tanner Linsley 2015-05-15 22:34:08 -06:00
  • 1d8d19d404 Prettified, and half way through doughut Tanner Linsley 2015-05-15 20:54:01 -06:00
  • ed6f234205 Bar chart pivot fix Tanner Linsley 2015-05-15 17:14:09 -06:00
  • 09c11440dd inGroupRange function for bar charts label mode Tanner Linsley 2015-05-15 17:07:41 -06:00
  • e58421a08a Line Chart label hoverMode & tooltips Tanner Linsley 2015-05-15 17:03:51 -06:00
  • fb580a6e48 lineChart single hoverMode tooltips, fallbackColor global Tanner Linsley 2015-05-15 16:40:01 -06:00
  • f79ebdaa88 Stable Bar Chart, DRY core functions Tanner Linsley 2015-05-15 00:04:42 -06:00
  • b432a3d6db labelMode tooltips and hover events Tanner Linsley 2015-05-14 23:18:47 -06:00
  • ef4c46f2be labelMode Tooltips almost there! Tanner Linsley 2015-05-14 17:25:56 -06:00
  • 69b1239aa1 Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev Tanner Linsley 2015-05-12 17:24:09 -06:00
  • 4ef57315da Getting into 'label' hoverMode tooltips Tanner Linsley 2015-05-12 17:22:47 -06:00
  • d26f37236d Update package.json for color lib location Evert Timberg 2015-05-12 18:01:28 -04:00
  • 63e115e7a8 hoverMode: "single" tooltips Tanner Linsley 2015-05-12 15:47:24 -06:00
  • 9f98334d6f Mid-code commit Tanner Linsley 2015-05-12 15:42:20 -06:00
  • 15f724f146 Rough Tooltips for 'single' hoverMode Tanner Linsley 2015-05-12 12:55:48 -06:00
  • afb22d15ae Better events Tanner Linsley 2015-05-12 10:34:47 -06:00
  • e709b13e77 Merge branch 'etimberg-fix/bar_chart_negative_values' into v2.0-dev etimberg 2015-05-12 08:01:22 -04:00
  • 460399f651 Merge branch 'fix/bar_chart_negative_values' of https://github.com/etimberg/Chart.js into etimberg-fix/bar_chart_negative_values etimberg 2015-05-12 08:00:14 -04:00
  • 132272d140 Revert build files Tanner Linsley 2015-05-12 01:18:37 -06:00
  • 9e4d90e110 Color Animation, Color Autopilot Tanner Linsley 2015-05-12 01:13:16 -06:00
  • df91739b77 hoverMode, onHover, key fixes Tanner Linsley 2015-05-11 19:43:17 -06:00
  • d3f7071983 Merge pull request #1114 from etimberg/feature/get_bar_at_event Tanner Linsley 2015-05-11 19:27:52 -06:00
  • d287a01b44 Make sure that the _start item is cleaned up during save. etimberg 2015-05-11 21:22:37 -04:00
  • 0eadc86d24 Added 2.0 alpha notes Derek Perkins 2015-05-11 19:00:04 -06:00
  • b8691c9581 Revert "Merge pull request #856 from tannerlinsley/editable-chart-config" Tanner Linsley 2015-05-11 18:57:14 -06:00
  • c7b117631b Merge pull request #1113 from tannerlinsley/deep-data Derek Perkins 2015-05-11 18:53:28 -06:00
  • 0e29cfdfda Bar attempt #5 Tanner Linsley 2015-05-11 18:12:44 -06:00
  • cf07df07d6 Bar Attempt # 4 Tanner Linsley 2015-05-08 16:20:21 -06:00
  • 4e3dd8ae3f Merge pull request #1066 from tannerlinsley/add-stacked-area Evert Timberg 2015-05-06 20:31:27 -04:00
  • 4b34bbadf9 Merge pull request #1098 from WouterSioen/fix-typo Tanner Linsley 2015-05-05 16:01:30 -06:00
  • cc57b9e581 Merge pull request #1098 from WouterSioen/fix-typo Evert Timberg 2015-05-05 14:39:35 -04:00
  • aad966820e Fix a typo: segment vs segement Wouter Sioen 2015-05-05 10:11:29 +02:00
  • 5443886ec3 Merge pull request #1068 from nnnick/animation-refactory William Entriken 2015-05-04 15:55:59 -04:00
  • a8063de6b8 Merge pull request #856 from tannerlinsley/editable-chart-config William Entriken 2015-05-04 15:28:03 -04:00
  • e13ada2b43 Ensure that the bar draws to the correct spot Evert Timberg 2015-05-02 15:03:40 -04:00
  • 62b29282fd Fix a minor bug Evert Timberg 2015-05-02 14:59:33 -04:00
  • 2814c8e44c Remove Math.sign Evert Timberg 2015-05-02 14:56:16 -04:00
  • 1df2b37bc5 Only draw positive radius arcs Fixes #592 Tanner Linsley 2015-04-30 15:49:52 -06:00