Merge pull request #2274 from palantir/release-1.0.0-rc6

Release version 1.0.0-rc6 (--> master)
palantir · Jun 10, 2015 · 39ca9c2 · 39ca9c2
2 parents 8a16b0f + 38760e3
commit 39ca9c2
Show file tree

Hide file tree

Showing 55 changed files with 3,359 additions and 961 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -147,6 +147,13 @@ module.exports = function(grunt) {
   var configJSON = {
     pkg: grunt.file.readJSON("package.json"),
     bump: bumpJSON,
+    umd: {
+      all: {
+        src: "plottable.js", 
+        objectToExport: "Plottable",
+//        amdModuleId: "Plottable",
+      }
+    },
     concat: {
       header: {
         src: ["license_header.txt", "plottable.js"],
@@ -323,6 +330,7 @@ module.exports = function(grunt) {
       "concat:definitions",
       "sed:definitions",
       "sed:private_definitions",
+      "umd:all", 
       "concat:header",
       "sed:version_number",
       "definitions_prod",

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "plottable",
   "description": "A library for creating charts out of D3",
-  "version": "1.0.0-rc5",
+  "version": "1.0.0-rc6",
   "main": ["plottable.js", "plottable.css"],
   "license": "MIT",
   "ignore": [

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "plottable.js",
   "description": "A library for creating charts out of D3",
-  "version": "1.0.0-rc5",
+  "version": "1.0.0-rc6",
   "repository": {
     "type": "git",
     "url": "https://github.com/palantir/plottable.git"
@@ -32,6 +32,7 @@
     "grunt-contrib-uglify": "~0.4.0",
     "grunt-shell": "0.7.0",
     "grunt-contrib-jshint": "^0.10.0",
-    "grunt-parallelize": "1.0.0"
+    "grunt-parallelize": "1.0.0",
+    "grunt-umd": "2.3.3"
   }
 }
diff --git a/plottable.d.ts b/plottable.d.ts
diff --git a/plottable.js b/plottable.js
diff --git a/plottable.min.js b/plottable.min.js
diff --git a/plottable.zip b/plottable.zip
diff --git a/quicktests/overlaying/index.html b/quicktests/overlaying/index.html
@@ -3,7 +3,6 @@
 <head>
   <script src="/bower_components/jQuery/dist/jquery.js" charset="utf-8"></script>
   <script src="/bower_components/d3/d3.js" charset="utf-8"></script>
-  <script src="/bower_components/lodash/dist/lodash.js"></script>
   <script src="/quicktests/exampleUtil.js"></script>
   <script src="/bower_components/svg-typewriter/svgtypewriter.js" charset="utf-8"></script>
   <link rel="stylesheet" type="text/css" href="/plottable.css">

diff --git a/quicktests/overlaying/tests/basic/negative_stacked_bar.js b/quicktests/overlaying/tests/basic/negative_stacked_bar.js
@@ -45,9 +45,14 @@ function run(svg, data, Plottable) {
     .addDataset(dataset4)
     .addDataset(dataset5)
     .labelsEnabled(true)
-    .labelFormatter(Plottable.Formatters.siSuffix())
     .animated(true);
 
+  if (typeof verticalPlot.labelsFormatter === "function") {
+    verticalPlot.labelsFormatter(Plottable.Formatters.siSuffix());
+  } else {
+    verticalPlot.labelFormatter(Plottable.Formatters.siSuffix());
+  }
+
   var horizontalPlot = new Plottable.Plots.StackedBar("horizontal");
   horizontalPlot.x(function(d) { return d.earnings; }, xScale2)
     .y(function(d) { return d.quarter; }, yScale2)
@@ -58,9 +63,14 @@ function run(svg, data, Plottable) {
     .addDataset(dataset4)
     .addDataset(dataset5)
     .labelsEnabled(true)
-    .labelFormatter(Plottable.Formatters.siSuffix())
     .animated(true);
 
+  if (typeof verticalPlot.labelsFormatter === "function") {
+    horizontalPlot.labelsFormatter(Plottable.Formatters.siSuffix());
+  } else {
+    horizontalPlot.labelFormatter(Plottable.Formatters.siSuffix());
+  }
+
   var chart1 = new Plottable.Components.Table([
     [yAxis1, verticalPlot], [null, xAxis1]
     ]);

diff --git a/quicktests/overlaying/tests/functional/base_animator.js b/quicktests/overlaying/tests/functional/base_animator.js
@@ -18,20 +18,24 @@ function run(svg, data, Plottable) {
     var xAxis = new Plottable.Axes.Category(xScale, "bottom");
     var yAxis = new Plottable.Axes.Numeric(yScale, "left");
     var animator = new Plottable.Animators.Base();
-        animator.duration(1000);
+        animator.stepDuration(1000);
         animator.maxTotalDuration(2000);
-        animator.maxIterativeDelay(100);
+        animator.iterativeDelay(100);
 
 
     var vbar = new Plottable.Plots.Bar()
       .x(function(d) { return d.x; }, xScale)
       .y(function(d) { return d.y; }, yScale)
       .attr("fill", function(d) { return d.type; }, colorScale)
       .labelsEnabled(true)
-      .labelFormatter(function(text){return text + "!";})
       .addDataset(new Plottable.Dataset(data))
-      .animator( "bars", animator)
+      .animator(Plottable.Plots.Animator.MAIN, animator)
       .animated(true);
+   if (typeof vbar.labelsFormatter === "function") {
+     vbar.labelsFormatter(function(text){return text + "!";});
+   } else {
+     vbar.labelFormatter(function(text){return text + "!";});
+   }
 
 
     var chart = new Plottable.Components.Table([

diff --git a/quicktests/umd/app.js b/quicktests/umd/app.js
@@ -0,0 +1,36 @@
+/*jshint strict:false */
+
+var require;
+
+require.config({
+  paths: {
+    d3: "../../bower_components/d3/d3",
+    plottable: "../../plottable" 
+  }
+});
+
+require(["d3"], function(d3) {
+  require(["plottable"], function(Plottable) {
+    var dataset1 = new Plottable.Dataset([
+      { name: "A", value: 2 },
+      { name: "B", value: 5 },
+      { name: "C", value: 3 }
+    ]);
+
+    var xScale = new Plottable.Scales.Category();
+    var xAxis = new Plottable.Axes.Category(xScale, "bottom");
+    var yScale = new Plottable.Scales.Linear();
+    var yAxis = new Plottable.Axes.Numeric(yScale, "left");
+
+    var plot = new Plottable.Plots.Bar("vertical");
+    plot.addDataset(dataset1);
+    plot.x(function(d) { return d.name; }, xScale);
+    plot.y(function(d) { return d.value; }, yScale);
+
+    var chart = new Plottable.Components.Table([
+      [yAxis, plot],
+      [null, xAxis]
+    ]);
+    chart.renderTo(d3.select("#chart"));
+  });
+});
diff --git a/quicktests/umd/index.html b/quicktests/umd/index.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>RequireJS loading</title>
+    <link rel="stylesheet" type="text/css" href="../../plottable.css">
+    <style>
+      body { background-color: #AAA; }
+      svg { background-color: #FFF; }
+    </style>
+    <script src="lib/require.js" data-main="app"></script>
+  </head>
+  <body>
+    <svg id="chart" width="640" height="480"></svg>
+  </body>
+
+</html>