ext_sprockets 0.1.5 → 0.1.6

data/node_modules/chart.js/package.json

@@ -2,7 +2,7 @@
   "name": "chart.js",
   "homepage": "http://www.chartjs.org",
   "description": "Simple HTML5 charts using the canvas element.",
-  "version": "2.7.1",
+  "version": "2.7.2",
   "license": "MIT",
   "main": "src/chart.js",
   "repository": {
@@ -10,30 +10,33 @@
     "url": "https://github.com/chartjs/Chart.js.git"
   },
   "devDependencies": {
-    "browserify": "^14.3.0",
-    "browserify-istanbul": "^2.0.0",
-    "bundle-collapser": "^1.2.1",
+    "browserify": "^14.5.0",
+    "browserify-istanbul": "^3.0.1",
+    "bundle-collapser": "^1.3.0",
     "child-process-promise": "^2.2.1",
-    "coveralls": "^2.13.1",
-    "gitbook-cli": "^2.3.0",
+    "coveralls": "^3.0.0",
+    "eslint": "^4.9.0",
+    "eslint-config-chartjs": "^0.1.0",
+    "eslint-plugin-html": "^4.0.2",
+    "gitbook-cli": "^2.3.2",
     "gulp": "3.9.x",
     "gulp-concat": "~2.6.x",
     "gulp-connect": "~5.0.0",
-    "gulp-eslint": "^3.0.1",
+    "gulp-eslint": "^4.0.0",
     "gulp-file": "^0.3.0",
-    "gulp-html-validator": "^0.0.5",
+    "gulp-htmllint": "^0.0.15",
     "gulp-insert": "~0.5.0",
-    "gulp-replace": "^0.5.4",
+    "gulp-replace": "^0.6.1",
     "gulp-size": "~2.1.0",
     "gulp-streamify": "^1.0.2",
     "gulp-uglify": "~3.0.x",
     "gulp-util": "~3.0.x",
     "gulp-zip": "~4.0.0",
-    "jasmine": "^2.6.0",
-    "jasmine-core": "^2.6.2",
-    "karma": "^1.7.0",
+    "jasmine": "^2.8.0",
+    "jasmine-core": "^2.8.0",
+    "karma": "^1.7.1",
     "karma-browserify": "^5.1.1",
-    "karma-chrome-launcher": "^2.1.1",
+    "karma-chrome-launcher": "^2.2.0",
     "karma-coverage": "^1.1.1",
     "karma-firefox-launcher": "^1.0.1",
     "karma-jasmine": "^1.1.0",
@@ -42,13 +45,13 @@
     "pixelmatch": "^4.0.2",
     "vinyl-source-stream": "^1.1.0",
     "watchify": "^3.9.0",
-    "yargs": "^8.0.1"
+    "yargs": "^9.0.1"
   },
   "spm": {
     "main": "Chart.js"
   },
   "dependencies": {
-    "chartjs-color": "~2.2.0",
-    "moment": "~2.18.0"
+    "chartjs-color": "^2.1.0",
+    "moment": "^2.10.2"
   }
 }

data/node_modules/chartkick/chartkick.js

@@ -174,7 +174,7 @@
 
   function runNext() {
     if (runningRequests < maxRequests) {
-      var request = pendingRequests.shift();
+      var request = pendingRequests.shift()
       if (request) {
         runningRequests++;
         getJSON(request[0], request[1], request[2]);
@@ -369,1135 +369,1116 @@
   }
 
   function loadAdapters() {
-    if (!ChartjsAdapter && "Chart" in window) {
-      ChartjsAdapter = (function () {
-        var Chart = window.Chart;
+    if (!HighchartsAdapter && "Highcharts" in window) {
+      HighchartsAdapter = new function () {
+        var Highcharts = window.Highcharts;
 
-        var baseOptions = {
-          maintainAspectRatio: false,
-          animation: false,
-          tooltips: {
-            displayColors: false
-          },
-          legend: {},
-          title: {fontSize: 20, fontColor: "#333"}
-        };
+        this.name = "highcharts";
 
         var defaultOptions = {
-          scales: {
-            yAxes: [
-              {
-                ticks: {
-                  maxTicksLimit: 4
-                },
-                scaleLabel: {
-                  fontSize: 16,
-                  // fontStyle: "bold",
-                  fontColor: "#333"
-                }
+          chart: {},
+          xAxis: {
+            title: {
+              text: null
+            },
+            labels: {
+              style: {
+                fontSize: "12px"
               }
-            ],
-            xAxes: [
-              {
-                gridLines: {
-                  drawOnChartArea: false
-                },
-                scaleLabel: {
-                  fontSize: 16,
-                  // fontStyle: "bold",
-                  fontColor: "#333"
-                },
-                time: {},
-                ticks: {}
+            }
+          },
+          yAxis: {
+            title: {
+              text: null
+            },
+            labels: {
+              style: {
+                fontSize: "12px"
               }
-            ]
+            }
+          },
+          title: {
+            text: null
+          },
+          credits: {
+            enabled: false
+          },
+          legend: {
+            borderWidth: 0
+          },
+          tooltip: {
+            style: {
+              fontSize: "12px"
+            }
+          },
+          plotOptions: {
+            areaspline: {},
+            series: {
+              marker: {}
+            }
           }
         };
 
-        // http://there4.io/2012/05/02/google-chart-color-list/
-        var defaultColors = [
-          "#3366CC", "#DC3912", "#FF9900", "#109618", "#990099", "#3B3EAC", "#0099C6",
-          "#DD4477", "#66AA00", "#B82E2E", "#316395", "#994499", "#22AA99", "#AAAA11",
-          "#6633CC", "#E67300", "#8B0707", "#329262", "#5574A6", "#651067"
-        ];
-
         var hideLegend = function (options, legend, hideLegend) {
           if (legend !== undefined) {
-            options.legend.display = !!legend;
+            options.legend.enabled = !!legend;
             if (legend && legend !== true) {
-              options.legend.position = legend;
+              if (legend === "top" || legend === "bottom") {
+                options.legend.verticalAlign = legend;
+              } else {
+                options.legend.layout = "vertical";
+                options.legend.verticalAlign = "middle";
+                options.legend.align = legend;
+              }
             }
           } else if (hideLegend) {
-            options.legend.display = false;
+            options.legend.enabled = false;
           }
         };
 
         var setTitle = function (options, title) {
-          options.title.display = true;
           options.title.text = title;
         };
 
         var setMin = function (options, min) {
-          if (min !== null) {
-            options.scales.yAxes[0].ticks.min = toFloat(min);
-          }
+          options.yAxis.min = min;
         };
 
         var setMax = function (options, max) {
-          options.scales.yAxes[0].ticks.max = toFloat(max);
-        };
-
-        var setBarMin = function (options, min) {
-          if (min !== null) {
-            options.scales.xAxes[0].ticks.min = toFloat(min);
-          }
-        };
-
-        var setBarMax = function (options, max) {
-          options.scales.xAxes[0].ticks.max = toFloat(max);
+          options.yAxis.max = max;
         };
 
         var setStacked = function (options, stacked) {
-          options.scales.xAxes[0].stacked = !!stacked;
-          options.scales.yAxes[0].stacked = !!stacked;
+          options.plotOptions.series.stacking = stacked ? "normal" : null;
         };
 
         var setXtitle = function (options, title) {
-          options.scales.xAxes[0].scaleLabel.display = true;
-          options.scales.xAxes[0].scaleLabel.labelString = title;
+          options.xAxis.title.text = title;
         };
 
         var setYtitle = function (options, title) {
-          options.scales.yAxes[0].scaleLabel.display = true;
-          options.scales.yAxes[0].scaleLabel.labelString = title;
+          options.yAxis.title.text = title;
         };
 
-        var drawChart = function(chart, type, data, options) {
-          if (chart.chart) {
-            chart.chart.destroy();
-          } else {
-            chart.element.innerHTML = "<canvas></canvas>";
-          }
+        var jsOptions = jsOptionsFunc(defaultOptions, hideLegend, setTitle, setMin, setMax, setStacked, setXtitle, setYtitle);
 
-          var ctx = chart.element.getElementsByTagName("CANVAS")[0];
-          chart.chart = new Chart(ctx, {
-            type: type,
-            data: data,
-            options: options
-          });
-        };
+        this.renderLineChart = function (chart, chartType) {
+          chartType = chartType || "spline";
+          var chartOptions = {};
+          if (chartType === "areaspline") {
+            chartOptions = {
+              plotOptions: {
+                areaspline: {
+                  stacking: "normal"
+                },
+                area: {
+                  stacking: "normal"
+                },
+                series: {
+                  marker: {
+                    enabled: false
+                  }
+                }
+              }
+            };
+          }
 
-        // http://stackoverflow.com/questions/5623838/rgb-to-hex-and-hex-to-rgb
-        var addOpacity = function(hex, opacity) {
-          var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
-          return result ? "rgba(" + parseInt(result[1], 16) + ", " + parseInt(result[2], 16) + ", " + parseInt(result[3], 16) + ", " + opacity + ")" : hex;
-        };
+          if (chart.options.curve === false) {
+            if (chartType === "areaspline") {
+              chartType = "area";
+            } else if (chartType === "spline") {
+              chartType = "line";
+            }
+          }
 
-        var setLabelSize = function (chart, data, options) {
-          var maxLabelSize = Math.ceil(chart.element.offsetWidth / 4.0 / data.labels.length);
-          if (maxLabelSize > 25) {
-            maxLabelSize = 25;
+          var options = jsOptions(chart, chart.options, chartOptions), data, i, j;
+          options.xAxis.type = chart.discrete ? "category" : "datetime";
+          if (!options.chart.type) {
+            options.chart.type = chartType;
           }
-          options.scales.xAxes[0].ticks.callback = function (value) {
-            value = toStr(value);
-            if (value.length > maxLabelSize) {
-              return value.substring(0, maxLabelSize - 2) + "...";
-            } else {
-              return value;
+          options.chart.renderTo = chart.element.id;
+
+          var series = chart.data;
+          for (i = 0; i < series.length; i++) {
+            data = series[i].data;
+            if (!chart.discrete) {
+              for (j = 0; j < data.length; j++) {
+                data[j][0] = data[j][0].getTime();
+              }
             }
-          };
+            series[i].marker = {symbol: "circle"};
+            if (chart.options.points === false) {
+              series[i].marker.enabled = false;
+            }
+          }
+          options.series = series;
+          chart.chart = new Highcharts.Chart(options);
         };
 
-        var jsOptions = jsOptionsFunc(merge(baseOptions, defaultOptions), hideLegend, setTitle, setMin, setMax, setStacked, setXtitle, setYtitle);
+        this.renderScatterChart = function (chart) {
+          var chartOptions = {};
+          var options = jsOptions(chart, chart.options, chartOptions);
+          options.chart.type = "scatter";
+          options.chart.renderTo = chart.element.id;
+          options.series = chart.data;
+          chart.chart = new Highcharts.Chart(options);
+        };
 
-        var createDataTable = function (chart, options, chartType) {
-          var datasets = [];
-          var labels = [];
+        this.renderPieChart = function (chart) {
+          var chartOptions = merge(defaultOptions, {});
 
-          var colors = chart.options.colors || defaultColors;
+          if (chart.options.colors) {
+            chartOptions.colors = chart.options.colors;
+          }
+          if (chart.options.donut) {
+            chartOptions.plotOptions = {pie: {innerSize: "50%"}};
+          }
 
-          var day = true;
-          var week = true;
-          var dayOfWeek;
-          var month = true;
-          var year = true;
-          var hour = true;
-          var minute = true;
-          var detectType = (chartType === "line" || chartType === "area") && !chart.discrete;
+          if ("legend" in chart.options) {
+            hideLegend(chartOptions, chart.options.legend);
+          }
 
-          var series = chart.data;
+          if (chart.options.title) {
+            setTitle(chartOptions, chart.options.title);
+          }
 
-          var sortedLabels = [];
+          var options = merge(chartOptions, chart.options.library || {});
+          options.chart.renderTo = chart.element.id;
+          options.series = [{
+            type: "pie",
+            name: chart.options.label || "Value",
+            data: chart.data
+          }];
+          chart.chart = new Highcharts.Chart(options);
+        };
+
+        this.renderColumnChart = function (chart, chartType) {
+          chartType = chartType || "column";
+          var series = chart.data;
+          var options = jsOptions(chart, chart.options), i, j, s, d, rows = [], categories = [];
+          options.chart.type = chartType;
+          options.chart.renderTo = chart.element.id;
 
-          var i, j, s, d, key, rows = [];
           for (i = 0; i < series.length; i++) {
             s = series[i];
 
             for (j = 0; j < s.data.length; j++) {
               d = s.data[j];
-              key = detectType ? d[0].getTime() : d[0];
-              if (!rows[key]) {
-                rows[key] = new Array(series.length);
-              }
-              rows[key][i] = toFloat(d[1]);
-              if (sortedLabels.indexOf(key) === -1) {
-                sortedLabels.push(key);
+              if (!rows[d[0]]) {
+                rows[d[0]] = new Array(series.length);
+                categories.push(d[0]);
               }
+              rows[d[0]][i] = d[1];
             }
           }
 
-          if (detectType || chart.options.xtype === "number") {
-            sortedLabels.sort(sortByNumber);
+          if (chart.options.xtype === "number") {
+            categories.sort(sortByNumber);
           }
 
-          var rows2 = [];
-          for (j = 0; j < series.length; j++) {
-            rows2.push([]);
-          }
+          options.xAxis.categories = categories;
 
-          var value;
-          var k;
-          for (k = 0; k < sortedLabels.length; k++) {
-            i = sortedLabels[k];
-            if (detectType) {
-              value = new Date(toFloat(i));
-              // TODO make this efficient
-              day = day && isDay(value);
-              if (!dayOfWeek) {
-                dayOfWeek = value.getDay();
-              }
-              week = week && isWeek(value, dayOfWeek);
-              month = month && isMonth(value);
-              year = year && isYear(value);
-              hour = hour && isHour(value);
-              minute = minute && isMinute(value);
-            } else {
-              value = i;
+          var newSeries = [], d2;
+          for (i = 0; i < series.length; i++) {
+            d = [];
+            for (j = 0; j < categories.length; j++) {
+              d.push(rows[categories[j]][i] || 0);
             }
-            labels.push(value);
-            for (j = 0; j < series.length; j++) {
-              // Chart.js doesn't like undefined
-              rows2[j].push(rows[i][j] === undefined ? null : rows[i][j]);
+
+            d2 = {
+              name: series[i].name,
+              data: d
+            }
+            if (series[i].stack) {
+              d2.stack = series[i].stack;
             }
+
+            newSeries.push(d2);
           }
+          options.series = newSeries;
 
-          for (i = 0; i < series.length; i++) {
-            s = series[i];
+          chart.chart = new Highcharts.Chart(options);
+        };
 
-            var color = s.color || colors[i];
-            var backgroundColor = chartType !== "line" ? addOpacity(color, 0.5) : color;
+        var self = this;
 
-            var dataset = {
-              label: s.name,
-              data: rows2[i],
-              fill: chartType === "area",
-              borderColor: color,
-              backgroundColor: backgroundColor,
-              pointBackgroundColor: color,
-              borderWidth: 2
-            };
+        this.renderBarChart = function (chart) {
+          self.renderColumnChart(chart, "bar");
+        };
 
-            if (s.stack) {
-              dataset.stack = s.stack;
-            }
+        this.renderAreaChart = function (chart) {
+          self.renderLineChart(chart, "areaspline");
+        };
+      };
+      adapters.push(HighchartsAdapter);
+    }
+    if (!GoogleChartsAdapter && window.google && (window.google.setOnLoadCallback || window.google.charts)) {
+      GoogleChartsAdapter = new function () {
+        var google = window.google;
 
-            // PATCH_BEGIN
-            if (chart.options.y2 === true) {
-              dataset.yAxisID = (s.y2 === true) ? 'y-axis-right' : 'y-axis-left';
-              options.scales.yAxes = [
-                { id: 'y-axis-left', position: 'left' },
-                { id: 'y-axis-right', position: 'right' }
-              ];
-            }
-            // PATCH_END
+        this.name = "google";
 
-            if (chart.options.curve === false) {
-              dataset.lineTension = 0;
-            }
+        var loaded = {};
+        var callbacks = [];
 
-            if (chart.options.points === false) {
-              dataset.pointRadius = 0;
-              dataset.pointHitRadius = 5;
+        var runCallbacks = function () {
+          var cb, call;
+          for (var i = 0; i < callbacks.length; i++) {
+            cb = callbacks[i];
+            call = google.visualization && ((cb.pack === "corechart" && google.visualization.LineChart) || (cb.pack === "timeline" && google.visualization.Timeline));
+            if (call) {
+              cb.callback();
+              callbacks.splice(i, 1);
+              i--;
             }
-
-            datasets.push(merge(dataset, s.library || {}));
           }
+        };
 
-          if (detectType && labels.length > 0) {
-            var minTime = labels[0].getTime();
-            var maxTime = labels[0].getTime();
-            for (i = 1; i < labels.length; i++) {
-              value = labels[i].getTime();
-              if (value < minTime) {
-                minTime = value;
-              }
-              if (value > maxTime) {
-                maxTime = value;
-              }
-            }
+        var waitForLoaded = function (pack, callback) {
+          if (!callback) {
+            callback = pack;
+            pack = "corechart";
+          }
 
-            var timeDiff = (maxTime - minTime) / (86400 * 1000.0);
+          callbacks.push({pack: pack, callback: callback});
 
-            if (!options.scales.xAxes[0].time.unit) {
-              var step;
-              if (year || timeDiff > 365 * 10) {
-                options.scales.xAxes[0].time.unit = "year";
-                step = 365;
-              } else if (month || timeDiff > 30 * 10) {
-                options.scales.xAxes[0].time.unit = "month";
-                step = 30;
-              } else if (day || timeDiff > 10) {
-                options.scales.xAxes[0].time.unit = "day";
-                step = 1;
-              } else if (hour || timeDiff > 0.5) {
-                options.scales.xAxes[0].time.displayFormats = {hour: "MMM D, h a"};
-                options.scales.xAxes[0].time.unit = "hour";
-                step = 1 / 24.0;
-              } else if (minute) {
-                options.scales.xAxes[0].time.displayFormats = {minute: "h:mm a"};
-                options.scales.xAxes[0].time.unit = "minute";
-                step = 1 / 24.0 / 60.0;
-              }
+          if (loaded[pack]) {
+            runCallbacks();
+          } else {
+            loaded[pack] = true;
 
-              if (step && timeDiff > 0) {
-                var unitStepSize = Math.ceil(timeDiff / step / (chart.element.offsetWidth / 100.0));
-                if (week && step === 1) {
-                  unitStepSize = Math.ceil(unitStepSize / 7.0) * 7;
-                }
-                options.scales.xAxes[0].time.unitStepSize = unitStepSize;
-              }
+            // https://groups.google.com/forum/#!topic/google-visualization-api/fMKJcyA2yyI
+            var loadOptions = {
+              packages: [pack],
+              callback: runCallbacks
+            };
+            if (config.language) {
+              loadOptions.language = config.language;
+            }
+            if (pack === "corechart" && config.mapsApiKey) {
+              loadOptions.mapsApiKey = config.mapsApiKey;
             }
 
-            if (!options.scales.xAxes[0].time.tooltipFormat) {
-              if (day) {
-                options.scales.xAxes[0].time.tooltipFormat = "ll";
-              } else if (hour) {
-                options.scales.xAxes[0].time.tooltipFormat = "MMM D, h a";
-              } else if (minute) {
-                options.scales.xAxes[0].time.tooltipFormat = "h:mm a";
-              }
+            if (window.google.setOnLoadCallback) {
+              google.load("visualization", "1", loadOptions);
+            } else {
+              google.charts.load("current", loadOptions);
             }
           }
-
-          var data = {
-            labels: labels,
-            datasets: datasets
-          };
-
-          return data;
         };
 
-        var renderLineChart = function (chart, chartType) {
-          if (chart.options.xtype === "number") {
-            return renderScatterChart(chart, chartType, true);
+        // Set chart options
+        var defaultOptions = {
+          chartArea: {},
+          fontName: "'Lucida Grande', 'Lucida Sans Unicode', Verdana, Arial, Helvetica, sans-serif",
+          pointSize: 6,
+          legend: {
+            textStyle: {
+              fontSize: 12,
+              color: "#444"
+            },
+            alignment: "center",
+            position: "right"
+          },
+          curveType: "function",
+          hAxis: {
+            textStyle: {
+              color: "#666",
+              fontSize: 12
+            },
+            titleTextStyle: {},
+            gridlines: {
+              color: "transparent"
+            },
+            baselineColor: "#ccc",
+            viewWindow: {}
+          },
+          vAxis: {
+            textStyle: {
+              color: "#666",
+              fontSize: 12
+            },
+            titleTextStyle: {},
+            baselineColor: "#ccc",
+            viewWindow: {}
+          },
+          tooltip: {
+            textStyle: {
+              color: "#666",
+              fontSize: 12
+            }
           }
+        };
 
-          var chartOptions = {};
-          if (chartType === "area") {
-            // TODO fix area stacked
-            // chartOptions.stacked = true;
-          }
-          // fix for https://github.com/chartjs/Chart.js/issues/2441
-          if (!chart.options.max && allZeros(chart.data)) {
-            chartOptions.max = 1;
+        var hideLegend = function (options, legend, hideLegend) {
+          if (legend !== undefined) {
+            var position;
+            if (!legend) {
+              position = "none";
+            } else if (legend === true) {
+              position = "right";
+            } else {
+              position = legend;
+            }
+            options.legend.position = position;
+          } else if (hideLegend) {
+            options.legend.position = "none";
           }
+        };
 
-          var options = jsOptions(chart, merge(chartOptions, chart.options));
-
-          var data = createDataTable(chart, options, chartType || "line");
+        var setTitle = function (options, title) {
+          options.title = title;
+          options.titleTextStyle = {color: "#333", fontSize: "20px"};
+        };
 
-          options.scales.xAxes[0].type = chart.discrete ? "category" : "time";
+        var setMin = function (options, min) {
+          options.vAxis.viewWindow.min = min;
+        };
 
-          drawChart(chart, "line", data, options);
+        var setMax = function (options, max) {
+          options.vAxis.viewWindow.max = max;
         };
 
-        var renderPieChart = function (chart) {
-          var options = merge({}, baseOptions);
-          if (chart.options.donut) {
-            options.cutoutPercentage = 50;
-          }
-
-          if ("legend" in chart.options) {
-            hideLegend(options, chart.options.legend);
-          }
-
-          if (chart.options.title) {
-            setTitle(options, chart.options.title);
-          }
-
-          options = merge(options, chart.options.library || {});
-
-          var labels = [];
-          var values = [];
-          for (var i = 0; i < chart.data.length; i++) {
-            var point = chart.data[i];
-            labels.push(point[0]);
-            values.push(point[1]);
-          }
-
-          var data = {
-            labels: labels,
-            datasets: [
-              {
-                data: values,
-                backgroundColor: chart.options.colors || defaultColors
-              }
-            ]
-          };
-
-          drawChart(chart, "pie", data, options);
+        var setBarMin = function (options, min) {
+          options.hAxis.viewWindow.min = min;
         };
 
-        var renderColumnChart = function (chart, chartType) {
-          var options;
-          if (chartType === "bar") {
-            options = jsOptionsFunc(merge(baseOptions, defaultOptions), hideLegend, setTitle, setBarMin, setBarMax, setStacked, setXtitle, setYtitle)(chart, chart.options);
-          } else {
-            options = jsOptions(chart, chart.options);
-          }
-          var data = createDataTable(chart, options, "column");
-          setLabelSize(chart, data, options);
-          drawChart(chart, (chartType === "bar" ? "horizontalBar" : "bar"), data, options);
+        var setBarMax = function (options, max) {
+          options.hAxis.viewWindow.max = max;
         };
 
-        var renderAreaChart = function (chart) {
-          renderLineChart(chart, "area");
+        var setStacked = function (options, stacked) {
+          options.isStacked = !!stacked;
         };
 
-        var renderBarChart = function (chart) {
-          renderColumnChart(chart, "bar");
+        var setXtitle = function (options, title) {
+          options.hAxis.title = title;
+          options.hAxis.titleTextStyle.italic = false;
         };
 
-        var renderScatterChart = function (chart, chartType, lineChart) {
-          chartType = chartType || "line";
+        var setYtitle = function (options, title) {
+          options.vAxis.title = title;
+          options.vAxis.titleTextStyle.italic = false;
+        };
 
-          var options = jsOptions(chart, chart.options);
+        var jsOptions = jsOptionsFunc(defaultOptions, hideLegend, setTitle, setMin, setMax, setStacked, setXtitle, setYtitle);
 
-          var colors = chart.options.colors || defaultColors;
+        // cant use object as key
+        var createDataTable = function (series, columnType, xtype) {
+          var i, j, s, d, key, rows = [], sortedLabels = [];
+          for (i = 0; i < series.length; i++) {
+            s = series[i];
 
-          var datasets = [];
-          var series = chart.data;
-          for (var i = 0; i < series.length; i++) {
-            var s = series[i];
-            var d = [];
-            for (var j = 0; j < s.data.length; j++) {
-              var point = {
-                x: toFloat(s.data[j][0]),
-                y: toFloat(s.data[j][1])
-              };
-              if (chartType === "bubble") {
-                point.r = toFloat(s.data[j][2]);
+            for (j = 0; j < s.data.length; j++) {
+              d = s.data[j];
+              key = (columnType === "datetime") ? d[0].getTime() : d[0];
+              if (!rows[key]) {
+                rows[key] = new Array(series.length);
+                sortedLabels.push(key);
               }
-              d.push(point);
+              rows[key][i] = toFloat(d[1]);
             }
-
-            var color = s.color || colors[i];
-            var backgroundColor = chartType === "area" ? addOpacity(color, 0.5) : color;
-
-            datasets.push({
-              label: s.name,
-              showLine: lineChart || false,
-              data: d,
-              borderColor: color,
-              backgroundColor: backgroundColor,
-              pointBackgroundColor: color,
-              fill: chartType === "area"
-            });
           }
 
-          if (chartType === "area") {
-            chartType = "line";
+          var rows2 = [];
+          var day = true;
+          var value;
+          for (var j = 0; j < sortedLabels.length; j++) {
+            var i = sortedLabels[j];
+            if (columnType === "datetime") {
+              value = new Date(toFloat(i));
+              day = day && isDay(value);
+            } else if (columnType === "number") {
+              value = toFloat(i);
+            } else {
+              value = i;
+            }
+            rows2.push([value].concat(rows[i]));
+          }
+          if (columnType === "datetime") {
+            rows2.sort(sortByTime);
+          } else if (columnType === "number") {
+            rows2.sort(sortByNumberSeries);
           }
 
-          var data = {datasets: datasets};
+          if (xtype === "number") {
+            rows2.sort(sortByNumberSeries);
 
-          options.scales.xAxes[0].type = "linear";
-          options.scales.xAxes[0].position = "bottom";
+            for (var i = 0; i < rows2.length; i++) {
+              rows2[i][0] = toStr(rows2[i][0]);
+            }
+          }
 
-          drawChart(chart, chartType, data, options);
-        };
+          // create datatable
+          var data = new google.visualization.DataTable();
+          columnType = columnType === "datetime" && day ? "date" : columnType;
+          data.addColumn(columnType, "");
+          for (i = 0; i < series.length; i++) {
+            data.addColumn("number", series[i].name);
+          }
+          data.addRows(rows2);
 
-        var renderBubbleChart = function (chart) {
-          renderScatterChart(chart, "bubble");
+          return data;
         };
 
-        return {
-          name: "chartjs",
-          renderLineChart: renderLineChart,
-          renderPieChart: renderPieChart,
-          renderColumnChart: renderColumnChart,
-          renderBarChart: renderBarChart,
-          renderAreaChart: renderAreaChart,
-          renderScatterChart: renderScatterChart,
-          renderBubbleChart: renderBubbleChart
+        var resize = function (callback) {
+          if (window.attachEvent) {
+            window.attachEvent("onresize", callback);
+          } else if (window.addEventListener) {
+            window.addEventListener("resize", callback, true);
+          }
+          callback();
         };
-      })();
-
-      adapters.push(ChartjsAdapter);
-    }
 
-    if (!HighchartsAdapter && "Highcharts" in window) {
-      HighchartsAdapter = (function () {
-        var Highcharts = window.Highcharts;
+        this.renderLineChart = function (chart) {
+          waitForLoaded(function () {
+            var chartOptions = {};
 
-        var defaultOptions = {
-          chart: {},
-          xAxis: {
-            title: {
-              text: null
-            },
-            labels: {
-              style: {
-                fontSize: "12px"
-              }
-            }
-          },
-          yAxis: {
-            title: {
-              text: null
-            },
-            labels: {
-              style: {
-                fontSize: "12px"
-              }
+            if (chart.options.curve === false) {
+              chartOptions.curveType = "none";
             }
-          },
-          title: {
-            text: null
-          },
-          credits: {
-            enabled: false
-          },
-          legend: {
-            borderWidth: 0
-          },
-          tooltip: {
-            style: {
-              fontSize: "12px"
+
+            if (chart.options.points === false) {
+              chartOptions.pointSize = 0;
             }
-          },
-          plotOptions: {
-            areaspline: {},
-            series: {
-              marker: {}
+
+            var options = jsOptions(chart, chart.options, chartOptions);
+            var columnType = chart.discrete ? "string" : "datetime";
+            if (chart.options.xtype === "number") {
+              columnType = "number";
             }
-          }
+            var data = createDataTable(chart.data, columnType);
+            chart.chart = new google.visualization.LineChart(chart.element);
+            resize(function () {
+              chart.chart.draw(data, options);
+            });
+          });
         };
 
-        var hideLegend = function (options, legend, hideLegend) {
-          if (legend !== undefined) {
-            options.legend.enabled = !!legend;
-            if (legend && legend !== true) {
-              if (legend === "top" || legend === "bottom") {
-                options.legend.verticalAlign = legend;
-              } else {
-                options.legend.layout = "vertical";
-                options.legend.verticalAlign = "middle";
-                options.legend.align = legend;
-              }
+        this.renderPieChart = function (chart) {
+          waitForLoaded(function () {
+            var chartOptions = {
+              chartArea: {
+                top: "10%",
+                height: "80%"
+              },
+              legend: {}
+            };
+            if (chart.options.colors) {
+              chartOptions.colors = chart.options.colors;
             }
-          } else if (hideLegend) {
-            options.legend.enabled = false;
-          }
-        };
+            if (chart.options.donut) {
+              chartOptions.pieHole = 0.5;
+            }
+            if ("legend" in chart.options) {
+              hideLegend(chartOptions, chart.options.legend);
+            }
+            if (chart.options.title) {
+              setTitle(chartOptions, chart.options.title);
+            }
+            var options = merge(merge(defaultOptions, chartOptions), chart.options.library || {});
 
-        var setTitle = function (options, title) {
-          options.title.text = title;
-        };
+            var data = new google.visualization.DataTable();
+            data.addColumn("string", "");
+            data.addColumn("number", "Value");
+            data.addRows(chart.data);
 
-        var setMin = function (options, min) {
-          options.yAxis.min = min;
+            chart.chart = new google.visualization.PieChart(chart.element);
+            resize(function () {
+              chart.chart.draw(data, options);
+            });
+          });
         };
 
-        var setMax = function (options, max) {
-          options.yAxis.max = max;
+        this.renderColumnChart = function (chart) {
+          waitForLoaded(function () {
+            var options = jsOptions(chart, chart.options);
+            var data = createDataTable(chart.data, "string", chart.options.xtype);
+            chart.chart = new google.visualization.ColumnChart(chart.element);
+            resize(function () {
+              chart.chart.draw(data, options);
+            });
+          });
         };
 
-        var setStacked = function (options, stacked) {
-          options.plotOptions.series.stacking = stacked ? "normal" : null;
-        };
-
-        var setXtitle = function (options, title) {
-          options.xAxis.title.text = title;
-        };
-
-        var setYtitle = function (options, title) {
-          options.yAxis.title.text = title;
-        };
-
-        var jsOptions = jsOptionsFunc(defaultOptions, hideLegend, setTitle, setMin, setMax, setStacked, setXtitle, setYtitle);
-
-        var drawChart = function(chart, data, options) {
-          if (chart.chart) {
-            chart.chart.destroy();
-          }
-
-          options.chart.renderTo = chart.element.id;
-          options.series = data;
-          chart.chart = new Highcharts.Chart(options);
-        };
-
-        var renderLineChart = function (chart, chartType) {
-          chartType = chartType || "spline";
-          var chartOptions = {};
-          if (chartType === "areaspline") {
-            chartOptions = {
-              plotOptions: {
-                areaspline: {
-                  stacking: "normal"
-                },
-                area: {
-                  stacking: "normal"
-                },
-                series: {
-                  marker: {
-                    enabled: false
-                  }
+        this.renderBarChart = function (chart) {
+          waitForLoaded(function () {
+            var chartOptions = {
+              hAxis: {
+                gridlines: {
+                  color: "#ccc"
                 }
               }
             };
-          }
-
-          if (chart.options.curve === false) {
-            if (chartType === "areaspline") {
-              chartType = "area";
-            } else if (chartType === "spline") {
-              chartType = "line";
-            }
-          }
+            var options = jsOptionsFunc(defaultOptions, hideLegend, setTitle, setBarMin, setBarMax, setStacked, setXtitle, setYtitle)(chart, chart.options, chartOptions);
+            var data = createDataTable(chart.data, "string", chart.options.xtype);
+            chart.chart = new google.visualization.BarChart(chart.element);
+            resize(function () {
+              chart.chart.draw(data, options);
+            });
+          });
+        };
 
-          var options = jsOptions(chart, chart.options, chartOptions), data, i, j;
-          options.xAxis.type = chart.discrete ? "category" : "datetime";
-          if (!options.chart.type) {
-            options.chart.type = chartType;
-          }
+        this.renderAreaChart = function (chart) {
+          waitForLoaded(function () {
+            var chartOptions = {
+              isStacked: true,
+              pointSize: 0,
+              areaOpacity: 0.5
+            };
 
-          var series = chart.data;
-          for (i = 0; i < series.length; i++) {
-            data = series[i].data;
-            if (!chart.discrete) {
-              for (j = 0; j < data.length; j++) {
-                data[j][0] = data[j][0].getTime();
-              }
-            }
-            series[i].marker = {symbol: "circle"};
-            if (chart.options.points === false) {
-              series[i].marker.enabled = false;
+            var options = jsOptions(chart, chart.options, chartOptions);
+            var columnType = chart.discrete ? "string" : "datetime";
+            if (chart.options.xtype === "number") {
+              columnType = "number";
             }
-          }
-
-          drawChart(chart, series, options);
-        };
-
-        var renderScatterChart = function (chart) {
-          var options = jsOptions(chart, chart.options, {});
-          options.chart.type = "scatter";
-          drawChart(chart, chart.data, options);
+            var data = createDataTable(chart.data, columnType);
+            chart.chart = new google.visualization.AreaChart(chart.element);
+            resize(function () {
+              chart.chart.draw(data, options);
+            });
+          });
         };
 
-        var renderPieChart = function (chart) {
-          var chartOptions = merge(defaultOptions, {});
-
-          if (chart.options.colors) {
-            chartOptions.colors = chart.options.colors;
-          }
-          if (chart.options.donut) {
-            chartOptions.plotOptions = {pie: {innerSize: "50%"}};
-          }
-
-          if ("legend" in chart.options) {
-            hideLegend(chartOptions, chart.options.legend);
-          }
-
-          if (chart.options.title) {
-            setTitle(chartOptions, chart.options.title);
-          }
+        this.renderGeoChart = function (chart) {
+          waitForLoaded(function () {
+            var chartOptions = {
+              legend: "none",
+              colorAxis: {
+                colors: chart.options.colors || ["#f6c7b6", "#ce502d"]
+              }
+            };
+            var options = merge(merge(defaultOptions, chartOptions), chart.options.library || {});
 
-          var options = merge(chartOptions, chart.options.library || {});
-          var series = [{
-            type: "pie",
-            name: chart.options.label || "Value",
-            data: chart.data
-          }];
+            var data = new google.visualization.DataTable();
+            data.addColumn("string", "");
+            data.addColumn("number", chart.options.label || "Value");
+            data.addRows(chart.data);
 
-          drawChart(chart, series, options);
+            chart.chart = new google.visualization.GeoChart(chart.element);
+            resize(function () {
+              chart.chart.draw(data, options);
+            });
+          });
         };
 
-        var renderColumnChart = function (chart, chartType) {
-          chartType = chartType || "column";
-          var series = chart.data;
-          var options = jsOptions(chart, chart.options), i, j, s, d, rows = [], categories = [];
-          options.chart.type = chartType;
-
-          for (i = 0; i < series.length; i++) {
-            s = series[i];
+        this.renderScatterChart = function (chart) {
+          waitForLoaded(function () {
+            var chartOptions = {};
+            var options = jsOptions(chart, chart.options, chartOptions);
 
-            for (j = 0; j < s.data.length; j++) {
-              d = s.data[j];
-              if (!rows[d[0]]) {
-                rows[d[0]] = new Array(series.length);
-                categories.push(d[0]);
+            var series = chart.data, rows2 = [], i, j, data, d;
+            for (i = 0; i < series.length; i++) {
+              d = series[i].data;
+              for (j = 0; j < d.length; j++) {
+                var row = new Array(series.length + 1);
+                row[0] = d[j][0];
+                row[i + 1] = d[j][1];
+                rows2.push(row);
               }
-              rows[d[0]][i] = d[1];
             }
-          }
 
-          if (chart.options.xtype === "number") {
-            categories.sort(sortByNumber);
-          }
-
-          options.xAxis.categories = categories;
-
-          var newSeries = [], d2;
-          for (i = 0; i < series.length; i++) {
-            d = [];
-            for (j = 0; j < categories.length; j++) {
-              d.push(rows[categories[j]][i] || 0);
-            }
-
-            d2 = {
-              name: series[i].name,
-              data: d
-            };
-            if (series[i].stack) {
-              d2.stack = series[i].stack;
+            var data = new google.visualization.DataTable();
+            data.addColumn("number", "");
+            for (i = 0; i < series.length; i++) {
+              data.addColumn("number", series[i].name);
             }
+            data.addRows(rows2);
 
-            newSeries.push(d2);
-          }
-
-          drawChart(chart, newSeries, options);
-        };
-
-        var renderBarChart = function (chart) {
-          renderColumnChart(chart, "bar");
-        };
-
-        var renderAreaChart = function (chart) {
-          renderLineChart(chart, "areaspline");
+            chart.chart = new google.visualization.ScatterChart(chart.element);
+            resize(function () {
+              chart.chart.draw(data, options);
+            });
+          });
         };
 
-        return {
-          name: "highcharts",
-          renderLineChart: renderLineChart,
-          renderPieChart: renderPieChart,
-          renderColumnChart: renderColumnChart,
-          renderBarChart: renderBarChart,
-          renderAreaChart: renderAreaChart,
-          renderScatterChart: renderScatterChart
-        };
-      })();
-      adapters.push(HighchartsAdapter);
-    }
-    if (!GoogleChartsAdapter && window.google && (window.google.setOnLoadCallback || window.google.charts)) {
-      GoogleChartsAdapter = (function () {
-        var google = window.google;
-
-        var loaded = {};
-        var callbacks = [];
+        this.renderTimeline = function (chart) {
+          waitForLoaded("timeline", function () {
+            var chartOptions = {
+              legend: "none"
+            };
 
-        var runCallbacks = function () {
-          var cb, call;
-          for (var i = 0; i < callbacks.length; i++) {
-            cb = callbacks[i];
-            call = google.visualization && ((cb.pack === "corechart" && google.visualization.LineChart) || (cb.pack === "timeline" && google.visualization.Timeline));
-            if (call) {
-              cb.callback();
-              callbacks.splice(i, 1);
-              i--;
+            if (chart.options.colors) {
+              chartOptions.colors = chart.options.colors;
             }
-          }
-        };
+            var options = merge(merge(defaultOptions, chartOptions), chart.options.library || {});
 
-        var waitForLoaded = function (pack, callback) {
-          if (!callback) {
-            callback = pack;
-            pack = "corechart";
-          }
+            var data = new google.visualization.DataTable();
+            data.addColumn({type: "string", id: "Name"});
+            data.addColumn({type: "date", id: "Start"});
+            data.addColumn({type: "date", id: "End"});
+            data.addRows(chart.data);
 
-          callbacks.push({pack: pack, callback: callback});
+            chart.element.style.lineHeight = "normal";
+            chart.chart = new google.visualization.Timeline(chart.element);
 
-          if (loaded[pack]) {
-            runCallbacks();
-          } else {
-            loaded[pack] = true;
+            resize(function () {
+              chart.chart.draw(data, options);
+            });
+          });
+        };
+      };
 
-            // https://groups.google.com/forum/#!topic/google-visualization-api/fMKJcyA2yyI
-            var loadOptions = {
-              packages: [pack],
-              callback: runCallbacks
-            };
-            if (config.language) {
-              loadOptions.language = config.language;
-            }
-            if (pack === "corechart" && config.mapsApiKey) {
-              loadOptions.mapsApiKey = config.mapsApiKey;
-            }
+      adapters.push(GoogleChartsAdapter);
+    }
+    if (!ChartjsAdapter && "Chart" in window) {
+      ChartjsAdapter = new function () {
+        var Chart = window.Chart;
 
-            if (window.google.setOnLoadCallback) {
-              google.load("visualization", "1", loadOptions);
-            } else {
-              google.charts.load("current", loadOptions);
-            }
-          }
-        };
+        this.name = "chartjs";
 
-        // Set chart options
-        var defaultOptions = {
-          chartArea: {},
-          fontName: "'Lucida Grande', 'Lucida Sans Unicode', Verdana, Arial, Helvetica, sans-serif",
-          pointSize: 6,
-          legend: {
-            textStyle: {
-              fontSize: 12,
-              color: "#444"
-            },
-            alignment: "center",
-            position: "right"
-          },
-          curveType: "function",
-          hAxis: {
-            textStyle: {
-              color: "#666",
-              fontSize: 12
-            },
-            titleTextStyle: {},
-            gridlines: {
-              color: "transparent"
-            },
-            baselineColor: "#ccc",
-            viewWindow: {}
-          },
-          vAxis: {
-            textStyle: {
-              color: "#666",
-              fontSize: 12
-            },
-            titleTextStyle: {},
-            baselineColor: "#ccc",
-            viewWindow: {}
-          },
-          tooltip: {
-            textStyle: {
-              color: "#666",
-              fontSize: 12
-            }
+        var baseOptions = {
+          maintainAspectRatio: false,
+          animation: false,
+          tooltips: {
+            displayColors: false
+          },
+          legend: {},
+          title: {fontSize: 20, fontColor: "#333"}
+        };
+
+        var defaultOptions = {
+          scales: {
+            yAxes: [
+              {
+                ticks: {
+                  maxTicksLimit: 4
+                },
+                scaleLabel: {
+                  fontSize: 16,
+                  // fontStyle: "bold",
+                  fontColor: "#333"
+                }
+              }
+            ],
+            xAxes: [
+              {
+                gridLines: {
+                  drawOnChartArea: false
+                },
+                scaleLabel: {
+                  fontSize: 16,
+                  // fontStyle: "bold",
+                  fontColor: "#333"
+                },
+                time: {},
+                ticks: {}
+              }
+            ]
           }
         };
 
+        // http://there4.io/2012/05/02/google-chart-color-list/
+        var defaultColors = [
+          "#3366CC", "#DC3912", "#FF9900", "#109618", "#990099", "#3B3EAC", "#0099C6",
+          "#DD4477", "#66AA00", "#B82E2E", "#316395", "#994499", "#22AA99", "#AAAA11",
+          "#6633CC", "#E67300", "#8B0707", "#329262", "#5574A6", "#651067"
+        ];
+
         var hideLegend = function (options, legend, hideLegend) {
           if (legend !== undefined) {
-            var position;
-            if (!legend) {
-              position = "none";
-            } else if (legend === true) {
-              position = "right";
-            } else {
-              position = legend;
+            options.legend.display = !!legend;
+            if (legend && legend !== true) {
+              options.legend.position = legend;
             }
-            options.legend.position = position;
           } else if (hideLegend) {
-            options.legend.position = "none";
+            options.legend.display = false;
           }
         };
 
         var setTitle = function (options, title) {
-          options.title = title;
-          options.titleTextStyle = {color: "#333", fontSize: "20px"};
+          options.title.display = true;
+          options.title.text = title;
         };
 
         var setMin = function (options, min) {
-          options.vAxis.viewWindow.min = min;
+          if (min !== null) {
+            options.scales.yAxes[0].ticks.min = toFloat(min);
+          }
         };
 
         var setMax = function (options, max) {
-          options.vAxis.viewWindow.max = max;
+          options.scales.yAxes[0].ticks.max = toFloat(max);
         };
 
         var setBarMin = function (options, min) {
-          options.hAxis.viewWindow.min = min;
+          if (min !== null) {
+            options.scales.xAxes[0].ticks.min = toFloat(min);
+          }
         };
 
         var setBarMax = function (options, max) {
-          options.hAxis.viewWindow.max = max;
+          options.scales.xAxes[0].ticks.max = toFloat(max);
         };
 
         var setStacked = function (options, stacked) {
-          options.isStacked = !!stacked;
+          options.scales.xAxes[0].stacked = !!stacked;
+          options.scales.yAxes[0].stacked = !!stacked;
         };
 
         var setXtitle = function (options, title) {
-          options.hAxis.title = title;
-          options.hAxis.titleTextStyle.italic = false;
+          options.scales.xAxes[0].scaleLabel.display = true;
+          options.scales.xAxes[0].scaleLabel.labelString = title;
         };
 
         var setYtitle = function (options, title) {
-          options.vAxis.title = title;
-          options.vAxis.titleTextStyle.italic = false;
+          options.scales.yAxes[0].scaleLabel.display = true;
+          options.scales.yAxes[0].scaleLabel.labelString = title;
         };
 
-        var jsOptions = jsOptionsFunc(defaultOptions, hideLegend, setTitle, setMin, setMax, setStacked, setXtitle, setYtitle);
+        var drawChart = function(chart, type, data, options) {
+          if (chart.chart) {
+            chart.chart.destroy();
+          } else {
+            chart.element.innerHTML = "<canvas></canvas>";
+          }
 
-        // cant use object as key
-        var createDataTable = function (series, columnType, xtype) {
-          var i, j, s, d, key, rows = [], sortedLabels = [];
+          var ctx = chart.element.getElementsByTagName("CANVAS")[0];
+          chart.chart = new Chart(ctx, {
+            type: type,
+            data: data,
+            options: options
+          });
+        };
+
+        // http://stackoverflow.com/questions/5623838/rgb-to-hex-and-hex-to-rgb
+        var addOpacity = function(hex, opacity) {
+          var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+          return result ? "rgba(" + parseInt(result[1], 16) + ", " + parseInt(result[2], 16) + ", " + parseInt(result[3], 16) + ", " + opacity + ")" : hex;
+        };
+
+        var setLabelSize = function (chart, data, options) {
+          var maxLabelSize = Math.ceil(chart.element.offsetWidth / 4.0 / data.labels.length);
+          if (maxLabelSize > 25) {
+            maxLabelSize = 25;
+          }
+          options.scales.xAxes[0].ticks.callback = function (value) {
+            value = toStr(value);
+            if (value.length > maxLabelSize) {
+              return value.substring(0, maxLabelSize - 2) + "...";
+            } else {
+              return value;
+            }
+          };
+        };
+
+        var jsOptions = jsOptionsFunc(merge(baseOptions, defaultOptions), hideLegend, setTitle, setMin, setMax, setStacked, setXtitle, setYtitle);
+
+        var createDataTable = function (chart, options, chartType) {
+          var datasets = [];
+          var labels = [];
+
+          var colors = chart.options.colors || defaultColors;
+
+          var day = true;
+          var week = true;
+          var dayOfWeek;
+          var month = true;
+          var year = true;
+          var hour = true;
+          var minute = true;
+          var detectType = (chartType === "line" || chartType === "area") && !chart.discrete;
+
+          var series = chart.data;
+
+          var sortedLabels = [];
+
+          var i, j, s, d, key, rows = [];
           for (i = 0; i < series.length; i++) {
             s = series[i];
 
             for (j = 0; j < s.data.length; j++) {
               d = s.data[j];
-              key = (columnType === "datetime") ? d[0].getTime() : d[0];
+              key = detectType ? d[0].getTime() : d[0];
               if (!rows[key]) {
                 rows[key] = new Array(series.length);
-                sortedLabels.push(key);
               }
               rows[key][i] = toFloat(d[1]);
+              if (sortedLabels.indexOf(key) === -1) {
+                sortedLabels.push(key);
+              }
             }
           }
 
+          if (detectType || chart.options.xtype === "number") {
+            sortedLabels.sort(sortByNumber);
+          }
+
           var rows2 = [];
-          var day = true;
+          for (j = 0; j < series.length; j++) {
+            rows2.push([]);
+          }
+
           var value;
-          for (j = 0; j < sortedLabels.length; j++) {
-            i = sortedLabels[j];
-            if (columnType === "datetime") {
+          var k;
+          for (k = 0; k < sortedLabels.length; k++) {
+            i = sortedLabels[k];
+            if (detectType) {
               value = new Date(toFloat(i));
+              // TODO make this efficient
               day = day && isDay(value);
-            } else if (columnType === "number") {
-              value = toFloat(i);
+              if (!dayOfWeek) {
+                dayOfWeek = value.getDay();
+              }
+              week = week && isWeek(value, dayOfWeek);
+              month = month && isMonth(value);
+              year = year && isYear(value);
+              hour = hour && isHour(value);
+              minute = minute && isMinute(value);
             } else {
               value = i;
             }
-            rows2.push([value].concat(rows[i]));
+            labels.push(value);
+            for (j = 0; j < series.length; j++) {
+              // Chart.js doesn't like undefined
+              rows2[j].push(rows[i][j] === undefined ? null : rows[i][j]);
+            }
           }
-          if (columnType === "datetime") {
-            rows2.sort(sortByTime);
-          } else if (columnType === "number") {
-            rows2.sort(sortByNumberSeries);
+
+          for (i = 0; i < series.length; i++) {
+            s = series[i];
+
+            var color = s.color || colors[i];
+            var backgroundColor = chartType !== "line" ? addOpacity(color, 0.5) : color;
+
+            var dataset = {
+              label: s.name,
+              data: rows2[i],
+              fill: chartType === "area",
+              borderColor: color,
+              backgroundColor: backgroundColor,
+              pointBackgroundColor: color,
+              borderWidth: 2
+            };
+
+            if (s.stack) {
+              dataset.stack = s.stack;
+            }
+
+            // PATCH_BEGIN
+            if (chart.options.y2 === true) {
+              dataset.yAxisID = (s.y2 === true) ? 'y-axis-right' : 'y-axis-left';
+              options.scales.yAxes = [
+                { id: 'y-axis-left', position: 'left' },
+                { id: 'y-axis-right', position: 'right' }
+              ];
+            }
+            // PATCH_END
+
+            if (chart.options.curve === false) {
+              dataset.lineTension = 0;
+            }
+
+            if (chart.options.points === false) {
+              dataset.pointRadius = 0;
+              dataset.pointHitRadius = 5;
+            }
+
+            datasets.push(merge(dataset, s.library || {}));
           }
 
-          if (xtype === "number") {
-            rows2.sort(sortByNumberSeries);
+          if (detectType && labels.length > 0) {
+            var minTime = labels[0].getTime();
+            var maxTime = labels[0].getTime();
+            for (i = 1; i < labels.length; i++) {
+              value = labels[i].getTime();
+              if (value < minTime) {
+                minTime = value;
+              }
+              if (value > maxTime) {
+                maxTime = value;
+              }
+            }
+
+            var timeDiff = (maxTime - minTime) / (86400 * 1000.0);
+
+            if (!options.scales.xAxes[0].time.unit) {
+              var step;
+              if (year || timeDiff > 365 * 10) {
+                options.scales.xAxes[0].time.unit = "year";
+                step = 365;
+              } else if (month || timeDiff > 30 * 10) {
+                options.scales.xAxes[0].time.unit = "month";
+                step = 30;
+              } else if (day || timeDiff > 10) {
+                options.scales.xAxes[0].time.unit = "day";
+                step = 1;
+              } else if (hour || timeDiff > 0.5) {
+                options.scales.xAxes[0].time.displayFormats = {hour: "MMM D, h a"};
+                options.scales.xAxes[0].time.unit = "hour";
+                step = 1 / 24.0;
+              } else if (minute) {
+                options.scales.xAxes[0].time.displayFormats = {minute: "h:mm a"};
+                options.scales.xAxes[0].time.unit = "minute";
+                step = 1 / 24.0 / 60.0;
+              }
+
+              if (step && timeDiff > 0) {
+                var unitStepSize = Math.ceil(timeDiff / step / (chart.element.offsetWidth / 100.0));
+                if (week && step === 1) {
+                  unitStepSize = Math.ceil(unitStepSize / 7.0) * 7;
+                }
+                options.scales.xAxes[0].time.unitStepSize = unitStepSize;
+              }
+            }
 
-            for (i = 0; i < rows2.length; i++) {
-              rows2[i][0] = toStr(rows2[i][0]);
+            if (!options.scales.xAxes[0].time.tooltipFormat) {
+              if (day) {
+                options.scales.xAxes[0].time.tooltipFormat = "ll";
+              } else if (hour) {
+                options.scales.xAxes[0].time.tooltipFormat = "MMM D, h a";
+              } else if (minute) {
+                options.scales.xAxes[0].time.tooltipFormat = "h:mm a";
+              }
             }
           }
 
-          // create datatable
-          var data = new google.visualization.DataTable();
-          columnType = columnType === "datetime" && day ? "date" : columnType;
-          data.addColumn(columnType, "");
-          for (i = 0; i < series.length; i++) {
-            data.addColumn("number", series[i].name);
-          }
-          data.addRows(rows2);
+          var data = {
+            labels: labels,
+            datasets: datasets
+          };
 
           return data;
         };
 
-        var resize = function (callback) {
-          if (window.attachEvent) {
-            window.attachEvent("onresize", callback);
-          } else if (window.addEventListener) {
-            window.addEventListener("resize", callback, true);
+        this.renderLineChart = function (chart, chartType) {
+          if (chart.options.xtype === "number") {
+            return self.renderScatterChart(chart, chartType, true);
           }
-          callback();
-        };
 
-        var drawChart = function(chart, type, data, options) {
-          if (chart.chart) {
-            chart.chart.clearChart();
+          var chartOptions = {};
+          if (chartType === "area") {
+            // TODO fix area stacked
+            // chartOptions.stacked = true;
+          }
+          // fix for https://github.com/chartjs/Chart.js/issues/2441
+          if (!chart.options.max && allZeros(chart.data)) {
+            chartOptions.max = 1;
           }
 
-          chart.chart = new type(chart.element);
-          resize(function () {
-            chart.chart.draw(data, options);
-          });
-        };
-
-        var renderLineChart = function (chart) {
-          waitForLoaded(function () {
-            var chartOptions = {};
-
-            if (chart.options.curve === false) {
-              chartOptions.curveType = "none";
-            }
+          var options = jsOptions(chart, merge(chartOptions, chart.options));
 
-            if (chart.options.points === false) {
-              chartOptions.pointSize = 0;
-            }
+          var data = createDataTable(chart, options, chartType || "line");
 
-            var options = jsOptions(chart, chart.options, chartOptions);
-            var columnType = chart.discrete ? "string" : "datetime";
-            if (chart.options.xtype === "number") {
-              columnType = "number";
-            }
-            var data = createDataTable(chart.data, columnType);
+          options.scales.xAxes[0].type = chart.discrete ? "category" : "time";
 
-            drawChart(chart, google.visualization.LineChart, data, options);
-          });
+          drawChart(chart, "line", data, options);
         };
 
-        var renderPieChart = function (chart) {
-          waitForLoaded(function () {
-            var chartOptions = {
-              chartArea: {
-                top: "10%",
-                height: "80%"
-              },
-              legend: {}
-            };
-            if (chart.options.colors) {
-              chartOptions.colors = chart.options.colors;
-            }
-            if (chart.options.donut) {
-              chartOptions.pieHole = 0.5;
-            }
-            if ("legend" in chart.options) {
-              hideLegend(chartOptions, chart.options.legend);
-            }
-            if (chart.options.title) {
-              setTitle(chartOptions, chart.options.title);
-            }
-            var options = merge(merge(defaultOptions, chartOptions), chart.options.library || {});
+        this.renderPieChart = function (chart) {
+          var options = merge({}, baseOptions);
+          if (chart.options.donut) {
+            options.cutoutPercentage = 50;
+          }
 
-            var data = new google.visualization.DataTable();
-            data.addColumn("string", "");
-            data.addColumn("number", "Value");
-            data.addRows(chart.data);
+          if ("legend" in chart.options) {
+            hideLegend(options, chart.options.legend);
+          }
 
-            drawChart(chart, google.visualization.PieChart, data, options);
-          });
-        };
+          if (chart.options.title) {
+            setTitle(options, chart.options.title);
+          }
 
-        var renderColumnChart = function (chart) {
-          waitForLoaded(function () {
-            var options = jsOptions(chart, chart.options);
-            var data = createDataTable(chart.data, "string", chart.options.xtype);
+          options = merge(options, chart.options.library || {});
 
-            drawChart(chart, google.visualization.ColumnChart, data, options);
-          });
-        };
+          var labels = [];
+          var values = [];
+          for (var i = 0; i < chart.data.length; i++) {
+            var point = chart.data[i];
+            labels.push(point[0]);
+            values.push(point[1]);
+          }
 
-        var renderBarChart = function (chart) {
-          waitForLoaded(function () {
-            var chartOptions = {
-              hAxis: {
-                gridlines: {
-                  color: "#ccc"
-                }
+          var data = {
+            labels: labels,
+            datasets: [
+              {
+                data: values,
+                backgroundColor: chart.options.colors || defaultColors
               }
-            };
-            var options = jsOptionsFunc(defaultOptions, hideLegend, setTitle, setBarMin, setBarMax, setStacked, setXtitle, setYtitle)(chart, chart.options, chartOptions);
-            var data = createDataTable(chart.data, "string", chart.options.xtype);
+            ]
+          };
 
-            drawChart(chart, google.visualization.BarChart, data, options);
-          });
+          drawChart(chart, "pie", data, options);
         };
 
-        var renderAreaChart = function (chart) {
-          waitForLoaded(function () {
-            var chartOptions = {
-              isStacked: true,
-              pointSize: 0,
-              areaOpacity: 0.5
-            };
+        this.renderColumnChart = function (chart, chartType) {
+          var options;
+          if (chartType === "bar") {
+            options = jsOptionsFunc(merge(baseOptions, defaultOptions), hideLegend, setTitle, setBarMin, setBarMax, setStacked, setXtitle, setYtitle)(chart, chart.options);
+          } else {
+            options = jsOptions(chart, chart.options);
+          }
+          var data = createDataTable(chart, options, "column");
+          setLabelSize(chart, data, options);
+          drawChart(chart, (chartType === "bar" ? "horizontalBar" : "bar"), data, options);
+        };
 
-            var options = jsOptions(chart, chart.options, chartOptions);
-            var columnType = chart.discrete ? "string" : "datetime";
-            if (chart.options.xtype === "number") {
-              columnType = "number";
-            }
-            var data = createDataTable(chart.data, columnType);
+        var self = this;
 
-            drawChart(chart, google.visualization.AreaChart, data, options);
-          });
+        this.renderAreaChart = function (chart) {
+          self.renderLineChart(chart, "area");
         };
 
-        var renderGeoChart = function (chart) {
-          waitForLoaded(function () {
-            var chartOptions = {
-              legend: "none",
-              colorAxis: {
-                colors: chart.options.colors || ["#f6c7b6", "#ce502d"]
-              }
-            };
-            var options = merge(merge(defaultOptions, chartOptions), chart.options.library || {});
+        this.renderBarChart = function (chart) {
+          self.renderColumnChart(chart, "bar");
+        };
 
-            var data = new google.visualization.DataTable();
-            data.addColumn("string", "");
-            data.addColumn("number", chart.options.label || "Value");
-            data.addRows(chart.data);
+        this.renderScatterChart = function (chart, chartType, lineChart) {
+          chartType = chartType || "line";
 
-            drawChart(chart, google.visualization.GeoChart, data, options);
-          });
-        };
+          var options = jsOptions(chart, chart.options);
 
-        var renderScatterChart = function (chart) {
-          waitForLoaded(function () {
-            var chartOptions = {};
-            var options = jsOptions(chart, chart.options, chartOptions);
+          var colors = chart.options.colors || defaultColors;
 
-            var series = chart.data, rows2 = [], i, j, data, d;
-            for (i = 0; i < series.length; i++) {
-              d = series[i].data;
-              for (j = 0; j < d.length; j++) {
-                var row = new Array(series.length + 1);
-                row[0] = d[j][0];
-                row[i + 1] = d[j][1];
-                rows2.push(row);
+          var datasets = [];
+          var series = chart.data;
+          for (var i = 0; i < series.length; i++) {
+            var s = series[i];
+            var d = [];
+            for (var j = 0; j < s.data.length; j++) {
+              var point = {
+                x: toFloat(s.data[j][0]),
+                y: toFloat(s.data[j][1])
+              };
+              if (chartType === "bubble") {
+                point.r = toFloat(s.data[j][2]);
               }
+              d.push(point);
             }
 
-            data = new google.visualization.DataTable();
-            data.addColumn("number", "");
-            for (i = 0; i < series.length; i++) {
-              data.addColumn("number", series[i].name);
-            }
-            data.addRows(rows2);
-
-            drawChart(chart, google.visualization.ScatterChart, data, options);
-          });
-        };
+            var color = s.color || colors[i];
+            var backgroundColor = chartType === "area" ? addOpacity(color, 0.5) : color;
 
-        var renderTimeline = function (chart) {
-          waitForLoaded("timeline", function () {
-            var chartOptions = {
-              legend: "none"
-            };
+            datasets.push({
+              label: s.name,
+              showLine: lineChart || false,
+              data: d,
+              borderColor: color,
+              backgroundColor: backgroundColor,
+              pointBackgroundColor: color,
+              fill: chartType === "area"
+            })
+          }
 
-            if (chart.options.colors) {
-              chartOptions.colors = chart.options.colors;
-            }
-            var options = merge(merge(defaultOptions, chartOptions), chart.options.library || {});
+          if (chartType === "area") {
+            chartType = "line";
+          }
 
-            var data = new google.visualization.DataTable();
-            data.addColumn({type: "string", id: "Name"});
-            data.addColumn({type: "date", id: "Start"});
-            data.addColumn({type: "date", id: "End"});
-            data.addRows(chart.data);
+          var data = {datasets: datasets};
 
-            chart.element.style.lineHeight = "normal";
+          options.scales.xAxes[0].type = "linear";
+          options.scales.xAxes[0].position = "bottom";
 
-            drawChart(chart, google.visualization.Timeline, data, options);
-          });
+          drawChart(chart, chartType, data, options);
         };
 
-        return {
-          name: "google",
-          renderLineChart: renderLineChart,
-          renderPieChart: renderPieChart,
-          renderColumnChart: renderColumnChart,
-          renderBarChart: renderBarChart,
-          renderAreaChart: renderAreaChart,
-          renderScatterChart: renderScatterChart,
-          renderGeoChart: renderGeoChart,
-          renderTimeline: renderTimeline
+        this.renderBubbleChart = function (chart) {
+          this.renderScatterChart(chart, "bubble");
         };
-      })();
+      };
 
-      adapters.push(GoogleChartsAdapter);
+      adapters.unshift(ChartjsAdapter);
     }
   }
 
@@ -1634,13 +1615,13 @@
   function copySeries(series) {
     var newSeries = [], i, j;
     for (i = 0; i < series.length; i++) {
-      var copy = {};
+      var copy = {}
       for (j in series[i]) {
         if (series[i].hasOwnProperty(j)) {
           copy[j] = series[i][j];
         }
       }
-      newSeries.push(copy);
+      newSeries.push(copy)
     }
     return newSeries;
   }
@@ -1739,7 +1720,7 @@
     if (!processData) {
       processData = function (chart) {
         return chart.rawData;
-      };
+      }
     }
 
     // getters
@@ -1801,7 +1782,7 @@
       } else {
         return null;
       }
-    };
+    }
 
     Chartkick.charts[element.id] = chart;