d3.csv/d3.json semantics change

web/ep/index.html

@@ -188,12 +188,11 @@ <h1 class="page-header">Members of the European parliament</h1>
 </div>
 
 <script>
-$(function() {
-    d3.csv("mep.csv", function(d) {return d;}
-      ,function(error, rows) {
-      grid ("#ep2014list",rows);
-      });      
-    });      
+  $(function () {
+    d3.csv("mep.csv").then(function (rows) {
+      grid("#ep2014list", rows);
+    });
+  });
 </script>
 
 <style>

web/examples/area.html

@@ -18,7 +18,7 @@
     <script type="text/javascript">
 
       var chart = dc.lineChart("#test");
-      d3.csv("morley.csv", function(error, experiments) {
+      d3.csv("morley.csv").then(function(experiments) {
 
           experiments.forEach(function(x) {
               x.Speed = +x.Speed;

web/examples/bar-extra-line.html

@@ -24,7 +24,7 @@
 <script type="text/javascript">
 
 var chart = dc.barChart("#test");
-d3.csv("morley.csv", function(error, experiments) {
+d3.csv("morley.csv").then(function(experiments) {
 
   experiments.forEach(function(x) {
     x.Speed = +x.Speed;

web/examples/bar-single-select.html

@@ -24,7 +24,7 @@
 <script type="text/javascript">
 
 var chart = dc.barChart("#test");
-d3.csv("morley.csv", function(error, experiments) {
+d3.csv("morley.csv").then(function(experiments) {
 
   experiments.forEach(function(x) {
     x.Speed = +x.Speed;

web/examples/bar.html

@@ -18,7 +18,7 @@
 <script type="text/javascript">
 
 var chart = dc.barChart("#test");
-d3.csv("morley.csv", function(error, experiments) {
+d3.csv("morley.csv").then(function(experiments) {
 
   experiments.forEach(function(x) {
     x.Speed = +x.Speed;

web/examples/box-plot-time.html

@@ -21,7 +21,7 @@
 var chart = dc.boxPlot("#box-test"),
     pie = dc.pieChart("#pie-chart");
 
-d3.csv("monthly-move.csv", function(error, data) {
+d3.csv("monthly-move.csv").then(function(data) {
 
   data.forEach(function(x) {
     x.date = new Date(x.date);

web/examples/box-plot.html

@@ -20,7 +20,7 @@
 
 var chart = dc.boxPlot("#box-test"),
     pie = dc.pieChart("#pie-chart");
-d3.csv("morley.csv", function(error, experiments) {
+d3.csv("morley.csv").then(function(experiments) {
 
   experiments.forEach(function(x) {
     x.Speed = +x.Speed;

web/examples/complex-reduce.html

@@ -94,7 +94,7 @@ <h4>Experiment</h4>
   };
 
   var runChart = dc.barChart("#test-run"), exptChart = dc.barChart("#test-expt");
-  d3.csv("morley.csv", function(error, experiments) {
+  d3.csv("morley.csv").then(function(experiments) {
       experiments.forEach(function(x) {
           x.Speed = +x.Speed;
       });

web/examples/composite.html

@@ -12,19 +12,16 @@
 <script type="text/javascript" src="header.js"></script>
 <div id="test_composed"></div>
 
-<script type="text/javascript" src="../js/queue.js"></script>
 <script type="text/javascript" src="../js/d3.js"></script>
 <script type="text/javascript" src="../js/crossfilter.js"></script>
 <script type="text/javascript" src="../js/dc.js"></script>
 <script type="text/javascript">
 
 var composite = dc.compositeChart("#test_composed");
 
-var q = queue()
-    .defer(d3.csv, "morley.csv")
-    .defer(d3.csv, "morley2.csv");
-
-q.await(function(error, exp1, exp2) {
+Promise.all([d3.csv("morley.csv"), d3.csv("morley2.csv")]).then(function(results) {
+    var exp1 = results[0],
+        exp2 = results[1];
 
     var ndx = crossfilter();
     ndx.add(exp1.map(function(d) {

web/examples/filter-stacks.html

@@ -36,7 +36,7 @@
 
       var chart = dc.barChart("#test"),
           pie = dc.pieChart('#pie');
-      d3.csv("morley.csv", function(error, experiments) {
+      d3.csv("morley.csv").then(function(experiments) {
 
           experiments.forEach(function(x) {
               x.Speed = +x.Speed;

web/examples/filtering-removing.html

@@ -29,7 +29,7 @@
     spendHistChart  = dc.barChart("#chart-hist-spend"),
     spenderRowChart = dc.rowChart("#chart-row-spenders");
 
-// use static or load via d3.csv("spendData.csv", function(error, spendData) {/* do stuff */});
+// use static or load via d3.csv("spendData.csv").then(function(spendData) {/* do stuff */});
 var spendData = [
     {Name: 'Mr A', Spent: '$40', Year: 2011},
     {Name: 'Mr B', Spent: '$10', Year: 2011},

web/examples/heat.html

@@ -25,7 +25,7 @@ <h2>Michelson–Morley experiment</h2>
 <script type="text/javascript">
 
 var chart = dc.heatMap("#test");
-d3.csv("morley.csv", function(error, experiments) {
+d3.csv("morley.csv").then(function(experiments) {
 
   var ndx    = crossfilter(experiments),
       runDim = ndx.dimension(function(d) { return [+d.Run, +d.Expt]; }),

web/examples/heatmap-filtering.html

@@ -25,7 +25,7 @@ <h2>Nasdaq 100 Percentage Gain by Month of Year</h2>
     var heatmapChart = dc.heatMap("#heatmap", chartGroup);
     var barChart = dc.barChart("#barchart", chartGroup);
 
-    d3.csv("../ndx.csv", function(error, data) {
+    d3.csv("../ndx.csv").then(function(data) {
 
         var dateFormatSpecifier = "%m/%d/%Y";
         var dateFormat = d3.timeFormat(dateFormatSpecifier);

web/examples/line.html

@@ -18,7 +18,7 @@
 <script type="text/javascript">
 
 var chart = dc.lineChart("#test");
-d3.csv("morley.csv", function(error, experiments) {
+d3.csv("morley.csv").then(function(experiments) {
 
   experiments.forEach(function(x) {
     x.Speed = +x.Speed;

web/examples/multi-focus.html

@@ -25,7 +25,7 @@
 var chart3 = dc.barChart("#test3");
 var chart4 = dc.barChart("#test4");
 
-d3.csv("morley.csv", function(error, experiments) {
+d3.csv("morley.csv").then(function(experiments) {
 
     experiments.forEach(function(x) {
         x.Speed = +x.Speed;

web/examples/multi-scatter.html

@@ -18,7 +18,7 @@
 <script type="text/javascript">
 
 var chart = dc.compositeChart("#test");
-d3.csv("morley.csv", function(error, experiments) {
+d3.csv("morley.csv").then(function(experiments) {
 
   experiments.forEach(function(x) {
     x.Speed = +x.Speed;

web/examples/number.html

@@ -46,7 +46,7 @@
     boxND    = dc.numberDisplay("#number-box"),
     meanND   = dc.numberDisplay("#mean"),
     expnND   = dc.numberDisplay("#expn");
-d3.csv("morley.csv", function(error, experiments) {
+d3.csv("morley.csv").then(function(experiments) {
 
   experiments.forEach(function(x) {
     x.Speed = +x.Speed * 1000;

web/examples/ordinal-bar.html

@@ -19,10 +19,7 @@
 
   var chart = dc.barChart('#test');
 
-  d3.json('fruits.json', function(error, counts) {
-      if(error)
-          throw new Error(error);
-
+  d3.json('fruits.json').then(function(counts) {
       var ndx            = crossfilter(counts),
           fruitDimension = ndx.dimension(function(d) {return d.name;}),
           sumGroup       = fruitDimension.group().reduceSum(function(d) {return d.cnt;});

web/examples/ordinal-line.html

@@ -19,10 +19,7 @@
 
   var chart = dc.lineChart('#test');
 
-  d3.json('fruits.json', function(error, counts) {
-      if(error)
-          throw new Error(error);
-
+  d3.json('fruits.json').then(function(counts) {
       var ndx            = crossfilter(counts),
           fruitDimension = ndx.dimension(function(d) {return d.name;}),
           sumGroup       = fruitDimension.group().reduceSum(function(d) {return d.cnt;});

web/examples/pie-external-labels.html

@@ -18,7 +18,7 @@
 <script type="text/javascript">
 
   var chart = dc.pieChart("#test");
-  d3.csv("morley.csv", function(error, experiments) {
+  d3.csv("morley.csv").then(function(experiments) {
 
       var ndx           = crossfilter(experiments),
           runDimension  = ndx.dimension(function(d) {return "run-"+d.Run;})

web/examples/pie.html

@@ -18,7 +18,7 @@
 <script type="text/javascript">
 
 var chart = dc.pieChart("#test");
-d3.csv("morley.csv", function(error, experiments) {
+d3.csv("morley.csv").then(function(experiments) {
 
   var ndx           = crossfilter(experiments),
       runDimension  = ndx.dimension(function(d) {return "run-"+d.Run;})

web/examples/range-series.html

@@ -24,7 +24,7 @@
 var overviewChart = dc.seriesChart("#test-overview");
 var ndx, runDimension, runGroup, overviewRunDimension, overviewRunGroup;
 
-d3.csv("morley.csv", function(error, experiments) {
+d3.csv("morley.csv").then(function(experiments) {
 
   ndx = crossfilter(experiments);
   runDimension = ndx.dimension(function(d) {return [+d.Expt, +d.Run]; });

web/examples/right-axis.html

@@ -21,7 +21,7 @@
 <script type="text/javascript">
     var moveChart = dc.compositeChart("#monthly-move-chart");
 
-    d3.csv("monthly-move.csv", function (error, data) {
+    d3.csv("monthly-move.csv").then(function (data) {
         var dateFormatSpecifier = "%m/%d/%Y";
         var dateFormat = d3.timeFormat(dateFormatSpecifier);
         var dateFormatParser = d3.timeParse(dateFormatSpecifier);

web/examples/row-vertical-line.html

@@ -18,7 +18,7 @@
 <script type="text/javascript">
 
 var chart = dc.rowChart("#test");
-d3.csv("morley.csv", function(error, experiments) {
+d3.csv("morley.csv").then(function(experiments) {
 
   experiments.forEach(function(x) {
     x.Speed = +x.Speed;

web/examples/row.html

@@ -18,7 +18,7 @@
 <script type="text/javascript">
 
 var chart = dc.rowChart("#test");
-d3.csv("morley.csv", function(error, experiments) {
+d3.csv("morley.csv").then(function(experiments) {
 
   experiments.forEach(function(x) {
     x.Speed = +x.Speed;

web/examples/scatter-series.html

@@ -20,7 +20,7 @@
 var chart = dc.seriesChart("#test");
 var ndx, runDimension, runGroup;
 
-d3.csv("morley.csv", function(error, experiments) {
+d3.csv("morley.csv").then(function(experiments) {
 
   ndx = crossfilter(experiments);
   runDimension = ndx.dimension(function(d) {return [+d.Expt, +d.Run]; });

web/examples/scatter.html

@@ -18,7 +18,7 @@
 <script type="text/javascript">
 
 var chart = dc.scatterPlot("#test");
-d3.csv("morley.csv", function(error, experiments) {
+d3.csv("morley.csv").then(function(experiments) {
 
   experiments.forEach(function(x) {
     x.Speed = +x.Speed;

web/examples/series.html

@@ -23,7 +23,7 @@
 var chart = dc.seriesChart("#test");
 var ndx, runDimension, runGroup;
 
-d3.csv("morley.csv", function(error, experiments) {
+d3.csv("morley.csv").then(function(experiments) {
 
   ndx = crossfilter(experiments);
   runDimension = ndx.dimension(function(d) {return [+d.Expt, +d.Run]; });
@@ -55,7 +55,7 @@
 
 function load_button(file) {
     return function load_it() {
-        d3.csv(file, function(error, experiments) {
+        d3.csv(file).then(function(experiments) {
             ndx.remove();
             ndx.add(experiments);
             dc.redrawAll();

web/examples/sparkline.html

@@ -25,7 +25,7 @@ <h3>Sparklines</h3>
 
   var barChart = dc.barChart("#bartest");
   var lineChart = dc.lineChart("#linetest");
-  d3.csv("morley.csv", function(error, experiments) {
+  d3.csv("morley.csv").then(function(experiments) {
 
       experiments.forEach(function(x) {
           x.Speed = +x.Speed;

web/examples/splom.html

@@ -92,10 +92,7 @@
           d3.select('#wait-url').attr('href', location.origin + location.pathname + '?nowait');
       }
 
-      d3.csv('iris.csv', function(error, iris) {
-          if(error)
-              throw new Error(error);
-
+      d3.csv('iris.csv').then(function(iris) {
           iris.forEach(function(d) {
               Object.keys(fields).forEach(function(ab) {
                   d[fields[ab]] = +d[fields[ab]];

web/examples/stacked-bar.html

@@ -23,7 +23,7 @@
     <script type="text/javascript">
 
       var chart = dc.barChart("#test");
-      d3.csv("morley.csv", function(error, experiments) {
+      d3.csv("morley.csv").then(function(experiments) {
 
           experiments.forEach(function(x) {
               x.Speed = +x.Speed;

web/examples/switching-time-intervals.html

@@ -57,10 +57,7 @@
             aggregate = find_query('aggregate') || 'average';
 
         var chart = dc.barChart("#test"), counter = dc.numberDisplay('#counter');
-        d3.csv(data, function(error, posts) {
-            if(error)
-                throw new Error(error);
-
+        d3.csv(data).then(function(posts) {
             posts.forEach(function(d) {
                 d[date_col] = new Date(d[date_col]);
                 d[val_col] = +d[val_col];

web/examples/table-on-aggregated-data.html

@@ -26,7 +26,7 @@
 <script type="text/javascript">
 
 var chart = dc.dataTable("#test");
-d3.csv("morley.csv", function(error, experiments) {
+d3.csv("morley.csv").then(function(experiments) {
   /* We will create a table that sorts the experiments
      from the one that has the highest average speed
      to the one that has the lowest average speed

web/examples/table-pagination.html

@@ -24,7 +24,7 @@
 
   var chart = dc.dataTable("#test");
   var ndx;
-d3.csv("morley.csv", function(error, experiments) {
+d3.csv("morley.csv").then(function(experiments) {
     ndx              = crossfilter(experiments);
     var fmt = d3.format('02d');
     var runDimension    = ndx.dimension(function(d) {return [fmt(+d.Expt),fmt(+d.Run)];}),

web/examples/time-intervals.html

@@ -59,7 +59,7 @@
   var monthChart = dc.barChart("#month");
   var costChart = dc.barChart("#cost");
   // data from http://stackoverflow.com/questions/22603788/crossfilter-how-to-extract-time-information-from-start-date-and-end-date-column
-  d3.csv("intervals.csv", function(error, projects) {
+  d3.csv("intervals.csv").then(function(projects) {
 
       projects.forEach(function(x) {
           x['Start Date'] = dateFormatParser(x['Start Date']);