Evert Timberg
|
051ef8178e
|
Merge pull request #1 from etimberg/feature/controllers-tanner
Chart controller, Dataset Controllers, Hybrid Charts
|
2015-06-15 17:32:19 -04:00 |
|
Evert Timberg
|
76d2a782fc
|
Linear scale is reversible
|
2015-06-15 17:31:29 -04:00 |
|
Tanner Linsley
|
257bdb2dbb
|
Hybrid Line and Bar chart - Line Now drawing
|
2015-06-15 15:27:56 -06:00 |
|
Tanner Linsley
|
b0ece8b516
|
New controllers, bar drawing (with errors)
|
2015-06-15 14:36:02 -06:00 |
|
Tanner Linsley
|
aaa2484e1b
|
Controller function organization
|
2015-06-14 19:42:39 -06:00 |
|
Tanner Linsley
|
43f2c015f3
|
Charts become config blocks (themes, if you will :)
|
2015-06-14 19:30:02 -06:00 |
|
Tanner Linsley
|
d811812356
|
Little tweaks
|
2015-06-14 19:26:44 -06:00 |
|
Tanner Linsley
|
d73dae09e7
|
No hardcoded chart type methods
|
2015-06-14 19:15:10 -06:00 |
|
Tanner Linsley
|
4047440acc
|
Git thinks the core file is new now haha
|
2015-06-14 18:10:00 -06:00 |
|
Tanner Linsley
|
3f9afb1f31
|
More core file separation, and no duplicate copyrights
|
2015-06-14 18:09:45 -06:00 |
|
Evert Timberg
|
81c66c8d85
|
Fix duplicate property
|
2015-06-14 17:05:46 -04:00 |
|
Evert Timberg
|
0fa2ac4ea0
|
Bar chart now uses the rectangular canvas & element controllers.
|
2015-06-14 15:26:34 -04:00 |
|
Evert Timberg
|
886c99623f
|
Drop the base class in favour of an expanded canvas controller. Renamed 'chart' to 'chartInstance' in the controllers
|
2015-06-14 13:37:37 -04:00 |
|
Evert Timberg
|
68ae02263b
|
Fix the broken scatter chart. Introduced the concept of a canvas controller that goes along with the element controller.
|
2015-06-14 13:00:09 -04:00 |
|
Evert Timberg
|
9751e8f5b1
|
Created a generic base class to be used by rectangular charts. Modified Chart.Type.extend to put the parent's prototype in __super__. Moved more code into the controller and renamed the controller to RectangularElementController.
|
2015-06-14 10:35:59 -04:00 |
|
Evert Timberg
|
89574b61c5
|
Prototype controller + some of line chart converted
|
2015-06-13 20:40:35 -04:00 |
|
Evert Timberg
|
253158cf1c
|
Merge pull request #1208 from etimberg/feature/v2.0-scale-refactor
Radial scale improvements
|
2015-06-13 17:51:17 -04:00 |
|
Evert Timberg
|
8c34bdbcd7
|
Clean up of radial linear scale. Radar chart update function improvements
|
2015-06-13 17:45:59 -04:00 |
|
Evert Timberg
|
ecd3b58b28
|
Fix typo in linear scale.
|
2015-06-13 14:47:13 -04:00 |
|
Evert Timberg
|
41bac830c5
|
Merge pull request #1207 from etimberg/feature/v2.0-scale-refactor
Move more scale configs into the scale defaults.
|
2015-06-13 14:30:18 -04:00 |
|
Evert Timberg
|
47b25d1c6d
|
Move linearRadial default config to be a property of the scale.
|
2015-06-13 14:16:01 -04:00 |
|
Evert Timberg
|
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
|
2015-06-13 13:57:55 -04:00 |
|
Evert Timberg
|
42856ec16a
|
Merge pull request #1206 from etimberg/feature/v2.0-scale-refactor
Category scale now has defaults.
|
2015-06-13 13:33:05 -04:00 |
|
Evert Timberg
|
faa43d51a9
|
Category scale now has defaults. Updated the bar & line charts to use this new default.
|
2015-06-13 13:25:41 -04:00 |
|
Evert Timberg
|
3e4fce58fa
|
Clone handles arrays better
|
2015-06-13 13:22:28 -04:00 |
|
Evert Timberg
|
b0bddce017
|
Remove some unused scale code
|
2015-06-13 11:45:30 -04:00 |
|
Evert Timberg
|
b5c69984e3
|
Change spaces to tabs throughout
|
2015-06-13 10:15:21 -04:00 |
|
Evert Timberg
|
a8375d0459
|
Merge pull request #1205 from etimberg/feature/v2.0-scale-refactor
Move things into the radialLinear scale
|
2015-06-13 10:01:06 -04:00 |
|
Evert Timberg
|
1f16b349d2
|
Merge Chart.scales into Chart.scaleService to be consistent
|
2015-06-13 09:55:43 -04:00 |
|
Evert Timberg
|
30019dfddd
|
Move some of the radial linear scale functions into the radialLinear scale
|
2015-06-13 09:51:28 -04:00 |
|
Evert Timberg
|
61eea7f4a1
|
Merge pull request #1204 from etimberg/feature/v2.0-scale-refactor
Scatter chart derives from line chart
|
2015-06-13 09:06:05 -04:00 |
|
Evert Timberg
|
6582e2ff06
|
Handle nesting better in the clone method so that we don't wipe out the line defaults when the scatter chart extends
|
2015-06-13 08:59:54 -04:00 |
|
Evert Timberg
|
8cfe21f6aa
|
Scatter chart now extends the line chart.
|
2015-06-13 08:46:49 -04:00 |
|
Evert Timberg
|
6815fc451f
|
Merge remote-tracking branch 'upstream/v2.0-dev' into feature/v2.0-scale-refactor
|
2015-06-13 08:35:34 -04:00 |
|
Tanner Linsley
|
31643ee598
|
Support jQuery' or native canvas element as chart context
|
2015-06-13 02:41:15 -06:00 |
|
Tanner Linsley
|
1a3bb25f5c
|
Reverse that :)
|
2015-06-13 02:13:38 -06:00 |
|
Tanner Linsley
|
181a61f16a
|
Do not update involuntarily on resize. Only render.
|
2015-06-13 02:08:55 -06:00 |
|
Tanner Linsley
|
763bde9ed1
|
chart.bar - remove tooltip on mouseout
|
2015-06-13 00:45:43 -06:00 |
|
Tanner Linsley
|
0486db1e74
|
Category Scale display false fixes
|
2015-06-13 00:30:42 -06:00 |
|
Evert Timberg
|
6185f156ea
|
Make the line and scatter charts almost identical. Next step is to merge them
|
2015-06-12 22:35:48 -04:00 |
|
Evert Timberg
|
d37e65c58c
|
Convert line chart to tabs from spaces
|
2015-06-12 22:07:07 -04:00 |
|
Evert Timberg
|
43efda72d4
|
Merge pull request #1202 from etimberg/feature/v2.0-scale-refactor
Push some of the scatter scale information down to the linear scale.
|
2015-06-12 21:54:03 -04:00 |
|
Evert Timberg
|
e55c0d4945
|
Push some of the scatter scale information down to the linear scale.
|
2015-06-12 21:46:47 -04:00 |
|
Evert Timberg
|
a518833f96
|
Merge pull request #1201 from etimberg/feature/v2.0-scale-refactor
Move stacked options into scales. Can be configured independently for each axis
|
2015-06-12 21:22:06 -04:00 |
|
Evert Timberg
|
49fe78643a
|
Removed unused options from the bar and line charts
|
2015-06-12 21:16:23 -04:00 |
|
Evert Timberg
|
d2ef4c9831
|
Move more data into the linear scale.This simplifies buildScale for line and bar charts
|
2015-06-12 21:15:15 -04:00 |
|
Evert Timberg
|
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
|
2015-06-12 20:50:26 -04:00 |
|
Evert Timberg
|
1e01e29f88
|
Bar stacked sample
|
2015-06-12 19:10:11 -04:00 |
|
Tanner Linsley
|
e9f206606d
|
Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev
|
2015-06-12 16:39:43 -06:00 |
|
Evert Timberg
|
c5e4912319
|
Rename 'scaleType' property to 'type; throughout samples & code
|
2015-06-12 18:24:51 -04:00 |
|