From 7165eb56944a6fe6deffe0da75370b0518ba3924 Mon Sep 17 00:00:00 2001
From: Justin Lan <jlan@palantir.com>
Date: Fri, 21 Feb 2014 16:00:38 -0800
Subject: [PATCH 01/11] Trying out jsFiddle integration again.

Using close-open trick to load external resources in <head>
---
 examples/simpleChart/demo.css    |  9 +++++++++
 examples/simpleChart/demo.detail |  7 +++++++
 examples/simpleChart/demo.html   |  3 +++
 examples/simpleChart/demo.js     | 20 ++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 100644 examples/simpleChart/demo.css
 create mode 100644 examples/simpleChart/demo.detail
 create mode 100644 examples/simpleChart/demo.html
 create mode 100644 examples/simpleChart/demo.js
diff --git a/examples/simpleChart/demo.css b/examples/simpleChart/demo.css
new file mode 100644
index 0000000000..920858e1ac
--- /dev/null
+++ b/examples/simpleChart/demo.css
@@ -0,0 +1,9 @@
+</style>
+<script src="http://palantir.github.io/plottable/plottable.js"></script>
+<link rel="stylesheet" type="text/css" href="http://palantir.github.io/plottable/style.css">
+<style>
+/* --- Put any additional styles after this line --- */
+.demo-title { font-size: 24pt; }
+.quadratic-series circle {
+    fill: red;
+}
diff --git a/examples/simpleChart/demo.detail b/examples/simpleChart/demo.detail
new file mode 100644
index 0000000000..21cae59a0a
--- /dev/null
+++ b/examples/simpleChart/demo.detail
@@ -0,0 +1,7 @@
+---
+name: Plottable.js Simple Chart Demo
+description: Creates a chart with an x-axis, y-axis, and circle renderer
+authors:
+  - Justin Lan
+normalize_css: no
+...
diff --git a/examples/simpleChart/demo.html b/examples/simpleChart/demo.html
new file mode 100644
index 0000000000..c40b8f893d
--- /dev/null
+++ b/examples/simpleChart/demo.html
@@ -0,0 +1,3 @@
+<div class="demo-title">Simple Chart</div>
+<br>
+<svg id="chart"></svg>
diff --git a/examples/simpleChart/demo.js b/examples/simpleChart/demo.js
new file mode 100644
index 0000000000..987e15b091
--- /dev/null
+++ b/examples/simpleChart/demo.js
@@ -0,0 +1,20 @@
+function makeQuadraticSeries(numPoints) {
+    var data = [];
+    for (var i = 0; i< numPoints; i++) {
+        data.push({x: i, y: i*i});
+    }
+    return {data: data, seriesName: "quadratic-series"};
+}
+
+var dataseries = makeQuadraticSeries(20);
+
+var svg = d3.select("#chart");
+svg.attr("width", 480).attr("height", 320);
+var xScale = new LinearScale();
+var yScale = new LinearScale();
+var xAxis = new XAxis(xScale, "bottom");
+var yAxis = new YAxis(yScale, "left");
+var renderAreaD1 = new CircleRenderer(dataseries, xScale, yScale);
+var basicTable = new Table([[yAxis, renderAreaD1],
+                            [null, xAxis]]);
+basicTable.anchor(svg).computeLayout().render();

From 2e90b008609af441a345dbb6dbdff0ff3879c46d Mon Sep 17 00:00:00 2001
From: Justin Lan <jlan@palantir.com>
Date: Fri, 21 Feb 2014 16:28:04 -0800
Subject: [PATCH 02/11] Modify demo.detail to try to get jsFiddle integration
 to work

---
 examples/simpleChart/demo.detail | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/examples/simpleChart/demo.detail b/examples/simpleChart/demo.detail
index 21cae59a0a..a8c25ed71a 100644
--- a/examples/simpleChart/demo.detail
+++ b/examples/simpleChart/demo.detail
@@ -3,5 +3,9 @@ name: Plottable.js Simple Chart Demo
 description: Creates a chart with an x-axis, y-axis, and circle renderer
 authors:
   - Justin Lan
+resources:
+  - http://d3js.org/d3.v3.min.js
+  - http://palantir.github.io/plottable/plottable.js
+  - http://palantir.github.io/plottable/style.css
 normalize_css: no
 ...

From 488323196376a795915a56a9ff1fe13e00f2a19f Mon Sep 17 00:00:00 2001
From: Justin Lan <jlan@palantir.com>
Date: Fri, 21 Feb 2014 16:37:00 -0800
Subject: [PATCH 03/11] Correctly name demo.details

---
 examples/simpleChart/{demo.detail => demo.details} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename examples/simpleChart/{demo.detail => demo.details} (100%)

diff --git a/examples/simpleChart/demo.detail b/examples/simpleChart/demo.details
similarity index 100%
rename from examples/simpleChart/demo.detail
rename to examples/simpleChart/demo.details

From f229b87c34d99ecbb6bf7623d07e4c859d5d238e Mon Sep 17 00:00:00 2001
From: Justin Lan <jlan@palantir.com>
Date: Fri, 21 Feb 2014 16:58:07 -0800
Subject: [PATCH 04/11] Try to set wrap for jsFiddle through demo.details

Also removed unnecessary (?) <script> tags since it seems to
load based on demo.details now.
---
 examples/simpleChart/demo.css     | 6 +-----
 examples/simpleChart/demo.details | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/examples/simpleChart/demo.css b/examples/simpleChart/demo.css
index 920858e1ac..ca1e61421c 100644
--- a/examples/simpleChart/demo.css
+++ b/examples/simpleChart/demo.css
@@ -1,8 +1,4 @@
-</style>
-<script src="http://palantir.github.io/plottable/plottable.js"></script>
-<link rel="stylesheet" type="text/css" href="http://palantir.github.io/plottable/style.css">
-<style>
-/* --- Put any additional styles after this line --- */
+
 .demo-title { font-size: 24pt; }
 .quadratic-series circle {
     fill: red;
diff --git a/examples/simpleChart/demo.details b/examples/simpleChart/demo.details
index a8c25ed71a..903b853df0 100644
--- a/examples/simpleChart/demo.details
+++ b/examples/simpleChart/demo.details
@@ -8,4 +8,5 @@ resources:
   - http://palantir.github.io/plottable/plottable.js
   - http://palantir.github.io/plottable/style.css
 normalize_css: no
+wrap: l
 ...

From ec48de270330a1d1576051692425cca014886759 Mon Sep 17 00:00:00 2001
From: Justin Lan <jlan@palantir.com>
Date: Fri, 21 Feb 2014 17:07:56 -0800
Subject: [PATCH 05/11] Trying onDomReady

---
 examples/simpleChart/demo.details | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/simpleChart/demo.details b/examples/simpleChart/demo.details
index 903b853df0..6401d0fe5e 100644
--- a/examples/simpleChart/demo.details
+++ b/examples/simpleChart/demo.details
@@ -8,5 +8,5 @@ resources:
   - http://palantir.github.io/plottable/plottable.js
   - http://palantir.github.io/plottable/style.css
 normalize_css: no
-wrap: l
+wrap: onDomReady
 ...

From e5c8cece3d8d80555cb4ebf45ddc853c3a5a2d3b Mon Sep 17 00:00:00 2001
From: Justin Lan <jlan@palantir.com>
Date: Fri, 21 Feb 2014 17:18:07 -0800
Subject: [PATCH 06/11] Change demo around so script gets executed at the right
 time

Wrapped the code in a function, then called it after the SVG is
added to the DOM.
---
 examples/simpleChart/demo.details |  1 -
 examples/simpleChart/demo.html    |  4 ++++
 examples/simpleChart/demo.js      | 38 ++++++++++++++++---------------
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/examples/simpleChart/demo.details b/examples/simpleChart/demo.details
index 6401d0fe5e..a8c25ed71a 100644
--- a/examples/simpleChart/demo.details
+++ b/examples/simpleChart/demo.details
@@ -8,5 +8,4 @@ resources:
   - http://palantir.github.io/plottable/plottable.js
   - http://palantir.github.io/plottable/style.css
 normalize_css: no
-wrap: onDomReady
 ...
diff --git a/examples/simpleChart/demo.html b/examples/simpleChart/demo.html
index c40b8f893d..41eecf98fd 100644
--- a/examples/simpleChart/demo.html
+++ b/examples/simpleChart/demo.html
@@ -1,3 +1,7 @@
 <div class="demo-title">Simple Chart</div>
 <br>
 <svg id="chart"></svg>
+
+<script>
+createSimpleChart();
+</script>
diff --git a/examples/simpleChart/demo.js b/examples/simpleChart/demo.js
index 987e15b091..9f35c4e1c2 100644
--- a/examples/simpleChart/demo.js
+++ b/examples/simpleChart/demo.js
@@ -1,20 +1,22 @@
-function makeQuadraticSeries(numPoints) {
-    var data = [];
-    for (var i = 0; i< numPoints; i++) {
-        data.push({x: i, y: i*i});
-    }
-    return {data: data, seriesName: "quadratic-series"};
-}
+function createSimpleChart() {
+  function makeQuadraticSeries(numPoints) {
+      var data = [];
+      for (var i = 0; i< numPoints; i++) {
+          data.push({x: i, y: i*i});
+      }
+      return {data: data, seriesName: "quadratic-series"};
+  }
 
-var dataseries = makeQuadraticSeries(20);
+  var dataseries = makeQuadraticSeries(20);
 
-var svg = d3.select("#chart");
-svg.attr("width", 480).attr("height", 320);
-var xScale = new LinearScale();
-var yScale = new LinearScale();
-var xAxis = new XAxis(xScale, "bottom");
-var yAxis = new YAxis(yScale, "left");
-var renderAreaD1 = new CircleRenderer(dataseries, xScale, yScale);
-var basicTable = new Table([[yAxis, renderAreaD1],
-                            [null, xAxis]]);
-basicTable.anchor(svg).computeLayout().render();
+  var svg = d3.select("#chart");
+  svg.attr("width", 480).attr("height", 320);
+  var xScale = new LinearScale();
+  var yScale = new LinearScale();
+  var xAxis = new XAxis(xScale, "bottom");
+  var yAxis = new YAxis(yScale, "left");
+  var renderAreaD1 = new CircleRenderer(dataseries, xScale, yScale);
+  var basicTable = new Table([[yAxis, renderAreaD1],
+                              [null, xAxis]]);
+  basicTable.anchor(svg).computeLayout().render();
+}

From 198e22686bb98d92f133f2020f65fd3a5e19b525 Mon Sep 17 00:00:00 2001
From: Daniel Mane <danmane@gmail.com>
Date: Fri, 21 Feb 2014 18:03:18 -0800
Subject: [PATCH 07/11] Tables now guess rowWeight and colWeight, although this
 can be overwritten. Close #106.

There was a slight annoyance in that Component tries to align itself in computeLayout,
and sets its size to the rowMinimum() if the rowWeight = 0 and minimum != 0. However
this interacted poorly with the table guessing 0 as its weight, which caused the table
to not throw insufficientSpaceError. I tried moving the error into the component but this
didn't work as it now caused textLabel to throw insufficientSpaceError rather than truncating text
as intended.

Fixed this by having the component.computeLayout only change availableWidth or availableHeight
if it has extra width or height to spare, which is logically a better behavior.
---
 examples/demo.ts    |  5 -----
 examples/demoDay.ts |  6 ------
 src/component.ts    |  4 ++--
 src/table.ts        | 35 ++++++++++++++++++++++++++++++++---
 test/tableTests.ts  | 27 +++++++++++++++++++++------
 5 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/examples/demo.ts b/examples/demo.ts
index 25a237950f..21c099f2b5 100644
--- a/examples/demo.ts
+++ b/examples/demo.ts
@@ -53,7 +53,6 @@ module Demo {
     var yScale = new LinearScale();
     var rightAxes = [new YAxis(yScale, "right"), new YAxis(yScale, "right")];
     var rightAxesTable = new Table([rightAxes]);
-    rightAxesTable.colWeight(0);
     var xAxis = new XAxis(xScale, "bottom");
     var data = makeRandomData(30);
     var renderArea = new LineRenderer(data, xScale, yScale);
@@ -75,10 +74,8 @@ module Demo {
     var yScale1 = new LinearScale();
     var leftAxes = [new YAxis(yScale1, "left"), new YAxis(yScale1, "left")];
     var leftAxesTable = new Table([leftAxes]);
-    leftAxesTable.colWeight(0);
     var rightAxes = [new YAxis(yScale1, "right"), new YAxis(yScale1, "right")];
     var rightAxesTable = new Table([rightAxes]);
-    rightAxesTable.colWeight(0);
     var data1 = makeRandomData(30, .0005);
     var renderer1 = new LineRenderer(data1, xScale1, yScale1);
     var row1: Component[] = [leftAxesTable, renderer1, rightAxesTable];
@@ -131,12 +128,10 @@ module Demo {
   var yAxisRight = new YAxis(yScale, "right");
   var yAxisRightLabel = new AxisLabel("bp y right qd", "vertical-right");
   var yAxisRightTable = new Table([[yAxisRight, yAxisRightLabel]]);
-  yAxisRightTable.colWeight(0);
 
   var yAxisLeft = new YAxis(yScale, "left");
   var yAxisLeftLabel = new AxisLabel("bp y left qd", "vertical-left");
   var yAxisLeftTable = new Table([[yAxisLeftLabel, yAxisLeft]]);
-  yAxisLeftTable.colWeight(0);
 
   var data = makeRandomData(30);
   var renderArea = new LineRenderer(data, xScale, yScale);
diff --git a/examples/demoDay.ts b/examples/demoDay.ts
index c81ed08245..508b684b1d 100644
--- a/examples/demoDay.ts
+++ b/examples/demoDay.ts
@@ -8,10 +8,8 @@ module DemoDay {
     s.yScale = new LinearScale();
     s.leftAxis = new YAxis(s.yScale, "left");
     var leftAxisTable = new Table([[new AxisLabel("y", "vertical-left"), s.leftAxis]]);
-    leftAxisTable.colWeight(0);
     s.xAxis = new XAxis(s.xScale, "bottom");
     var xAxisTable = new Table([[s.xAxis], [new AxisLabel("x")]]);
-    xAxisTable.rowWeight(0);
 
     s.renderer = new CircleRenderer(data, s.xScale, s.yScale, null, null, 1.5);
     s.xSpark = new LinearScale();
@@ -37,9 +35,7 @@ module DemoDay {
     h.xAxis1 = new XAxis(h.xScale1, "bottom");
     h.yAxis1 = new YAxis(h.yScale1, "right");
     var labelX1Table = new Table([[h.xAxis1], [new AxisLabel("X values")]]);
-    labelX1Table.rowWeight(0);
     var labelY1Table = new Table([[h.yAxis1, new AxisLabel("Counts", "vertical-right")]]);
-    labelY1Table.colWeight(0);
     var table1 = new Table([[h.renderer1, labelY1Table], [labelX1Table, null]]);
 
     var yExtent = d3.extent(data, (d) => d.y);
@@ -52,9 +48,7 @@ module DemoDay {
     h.xAxis2 = new XAxis(h.xScale2, "bottom");
     h.yAxis2 = new YAxis(h.yScale2, "right");
     var labelX2Table = new Table([[h.xAxis2], [new AxisLabel("Y values")]]);
-    labelX2Table.rowWeight(0);
     var labelY2Table = new Table([[h.yAxis2, new AxisLabel("Counts", "vertical-right")]]);
-    labelY2Table.colWeight(0);
     var table2 = new Table([[h.renderer2, labelY2Table], [labelX2Table, null]]);
 
     h.table = new Table([[table1], [table2]]);
diff --git a/src/component.ts b/src/component.ts
index 1c9a52f64e..19cf4d7cf7 100644
--- a/src/component.ts
+++ b/src/component.ts
@@ -84,11 +84,11 @@ class Component {
     }
     if (this.rowWeight() === 0 && this.rowMinimum() !== 0) {
       yOffset += (availableHeight - this.rowMinimum()) * this.yAlignProportion;
-      availableHeight = this.rowMinimum();
+      availableHeight = availableHeight > this.rowMinimum() ? this.rowMinimum() : availableHeight;
     }
     if (this.colWeight() === 0 && this.colMinimum() !== 0) {
       xOffset += (availableWidth - this.colMinimum()) * this.xAlignProportion;
-      availableWidth = this.colMinimum();
+      availableWidth = availableWidth > this.colMinimum() ? this.colMinimum() : availableWidth;
     }
     this.xOffset = xOffset;
     this.yOffset = yOffset;
diff --git a/src/table.ts b/src/table.ts
index 2100499bfb..6802b2f5cc 100644
--- a/src/table.ts
+++ b/src/table.ts
@@ -18,7 +18,10 @@ class Table extends Component {
   private rowWeightSum: number;
   private colWeightSum: number;
 
-  constructor(rows: Component[][], rowWeightVal=1, colWeightVal=1) {
+  private guessRowWeight = true;
+  private guessColWeight = true;
+
+  constructor(rows: Component[][]) {
     super();
     this.classed(Table.CSS_CLASS, true);
     // Clean out any null components and replace them with base Components
@@ -28,7 +31,6 @@ class Table extends Component {
     this.cols = d3.transpose(rows);
     this.nRows = this.rows.length;
     this.nCols = this.cols.length;
-    super.rowWeight(rowWeightVal).colWeight(colWeightVal);
   }
 
   public anchor(element: D3.Selection) {
@@ -49,7 +51,7 @@ class Table extends Component {
     var freeWidth = this.availableWidth - this.colMinimum();
     var freeHeight = this.availableHeight - this.rowMinimum();
     if (freeWidth < 0 || freeHeight < 0) {
-      throw new Error("InsufficientSpaceError");
+      throw new Error("Insufficient Space");
     }
 
     // distribute remaining height to rows
@@ -101,6 +103,33 @@ class Table extends Component {
   }
 
   /* Getters */
+
+  public rowWeight(): number;
+  public rowWeight(newVal: number): Table;
+  public rowWeight(newVal?: number): any {
+    if (newVal != null || !this.guessRowWeight) {
+      this.guessRowWeight = false;
+      return super.rowWeight(newVal);
+    } else {
+      var componentWeights: number[][] = this.rows.map((r) => r.map((c) => c.rowWeight()));
+      var biggestWeight = d3.max(componentWeights.map((ws) => d3.max(ws)));
+      return biggestWeight > 0 ? 1 : 0;
+    }
+  }
+
+  public colWeight(): number;
+  public colWeight(newVal: number): Table;
+  public colWeight(newVal?: number): any {
+    if (newVal != null || !this.guessColWeight) {
+      this.guessColWeight = false;
+      return super.colWeight(newVal);
+    } else {
+      var componentWeights: number[][] = this.rows.map((r) => r.map((c) => c.colWeight()));
+      var biggestWeight = d3.max(componentWeights.map((ws) => d3.max(ws)));
+      return biggestWeight > 0 ? 1 : 0;
+    }
+  }
+
   public rowMinimum(): number;
   public rowMinimum(newVal: number): Component;
   public rowMinimum(newVal?: number): any {
diff --git a/test/tableTests.ts b/test/tableTests.ts
index 57bd2b13db..b3188f8213 100644
--- a/test/tableTests.ts
+++ b/test/tableTests.ts
@@ -5,13 +5,12 @@ var assert = chai.assert;
 function generateBasicTable(nRows, nCols) {
   // makes a table with exactly nRows * nCols children in a regular grid, with each
   // child being a basic component
-  var emptyDataset: IDataset = {data: [], seriesName: "blah"};
   var rows: Component[][] = [];
   var components: Component[] = [];
   for(var i=0; i<nRows; i++) {
     var cols = [];
     for(var j=0; j<nCols; j++) {
-      var r = new Component();
+      var r = new Component().rowWeight(1).colWeight(1);
       cols.push(r);
       components.push(r);
     }
@@ -34,13 +33,12 @@ describe("Tables", () => {
     assert.equal(component.constructor.name, "Component", "the component is a base Component");
   });
 
-  it("tables with insufficient space throw InsufficientSpaceError", () => {
+  it("tables with insufficient space throw Insufficient Space", () => {
     var svg = generateSVG(200, 200);
-    var c = new Component();
-    c.rowMinimum(300).colMinimum(300);
+    var c = new Component().rowMinimum(300).colMinimum(300);
     var t = new Table([[c]]);
     t.anchor(svg);
-    assert.throws(() => t.computeLayout(), Error, "InsufficientSpaceError");
+    assert.throws(() => t.computeLayout(), Error, "Insufficient Space");
     svg.remove();
   });
 
@@ -133,4 +131,21 @@ describe("Tables", () => {
     assert.throws(() => table.rowMinimum(3), Error, "cannot be directly set");
     assert.throws(() => table.colMinimum(3), Error, "cannot be directly set");
   });
+
+  it("tables guess weights intelligently", () => {
+    var c1 = new Component().rowWeight(0).colWeight(0);
+    var c2 = new Component().rowWeight(0).colWeight(0);
+    var table = new Table([[c1], [c2]]);
+    assert.equal(table.rowWeight(), 0, "the first table guessed 0 for rowWeight");
+    assert.equal(table.colWeight(), 0, "the first table guessed 0 for rowWeight");
+
+    c1.rowWeight(0);
+    c2.rowWeight(3);
+
+    assert.equal(table.rowWeight(), 1, "the table now guesses 1 for rowWeight");
+    assert.equal(table.colWeight(), 0, "the table still guesses 0 for colWeight");
+
+    assert.equal(table.rowWeight(2), table, "rowWeight returned the table");
+    assert.equal(table.rowWeight(), 2, "the rowWeight was overridden explicitly");
+  });
 });

From 8c818bfe1e561905c2562a6a84bc511df0e3aa65 Mon Sep 17 00:00:00 2001
From: Justin Lan <jlan@palantir.com>
Date: Fri, 21 Feb 2014 18:03:28 -0800
Subject: [PATCH 08/11] jsFiddle demos: Move library loading into html

This avoids jsFiddle's background magic and makes it more clear
to users how plottable is to be used.
---
 examples/simpleChart/demo.details |  4 ----
 examples/simpleChart/demo.html    | 10 +++++-----
 examples/simpleChart/demo.js      |  6 +++---
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/examples/simpleChart/demo.details b/examples/simpleChart/demo.details
index a8c25ed71a..21cae59a0a 100644
--- a/examples/simpleChart/demo.details
+++ b/examples/simpleChart/demo.details
@@ -3,9 +3,5 @@ name: Plottable.js Simple Chart Demo
 description: Creates a chart with an x-axis, y-axis, and circle renderer
 authors:
   - Justin Lan
-resources:
-  - http://d3js.org/d3.v3.min.js
-  - http://palantir.github.io/plottable/plottable.js
-  - http://palantir.github.io/plottable/style.css
 normalize_css: no
 ...
diff --git a/examples/simpleChart/demo.html b/examples/simpleChart/demo.html
index 41eecf98fd..2bb134a2e6 100644
--- a/examples/simpleChart/demo.html
+++ b/examples/simpleChart/demo.html
@@ -1,7 +1,7 @@
+<script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
+<script src="http://palantir.github.io/plottable/plottable.js"></script>
+<link rel="stylesheet" type="text/css" href="http://palantir.github.io/plottable/style.css">
+
 <div class="demo-title">Simple Chart</div>
 <br>
-<svg id="chart"></svg>
-
-<script>
-createSimpleChart();
-</script>
+<svg id="simple-chart"></svg>
diff --git a/examples/simpleChart/demo.js b/examples/simpleChart/demo.js
index 9f35c4e1c2..c005cefa7c 100644
--- a/examples/simpleChart/demo.js
+++ b/examples/simpleChart/demo.js
@@ -1,4 +1,4 @@
-function createSimpleChart() {
+window.onload = function() {
   function makeQuadraticSeries(numPoints) {
       var data = [];
       for (var i = 0; i< numPoints; i++) {
@@ -9,7 +9,7 @@ function createSimpleChart() {
 
   var dataseries = makeQuadraticSeries(20);
 
-  var svg = d3.select("#chart");
+  var svg = d3.select("#simple-chart");
   svg.attr("width", 480).attr("height", 320);
   var xScale = new LinearScale();
   var yScale = new LinearScale();
@@ -19,4 +19,4 @@ function createSimpleChart() {
   var basicTable = new Table([[yAxis, renderAreaD1],
                               [null, xAxis]]);
   basicTable.anchor(svg).computeLayout().render();
-}
+};

From 044d9533911e56e16c099e3a54188e14b81be1a7 Mon Sep 17 00:00:00 2001
From: Daniel Mane <danmane@gmail.com>
Date: Mon, 24 Feb 2014 12:02:59 -0800
Subject: [PATCH 09/11] Update readme

---
 README.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5626c83ead..a86da95ddc 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,16 @@
 Plottable.js
 ============
 
-Plottable.js is a library for easily creating beautiful, flexible, interactive, and performant charts for the web. It is built on top of d3 and provides a higher level of abstraction: the developer does not need to worry about d3's low-level components and can easily access many chart renderers, interaction patterns, and a flexible layout engine. Plottable.js is being developed by Palantir Technologies, and is written in TypeScript.
+Plottable.js is a library for easily creating flexible, interactive, and performant charts for the web. It is built on top of d3 and provides a higher level of abstraction.
 
-Plottable.js is currently in early alpha and does not yet have a stable API.
+Plottable consists of three main pieces:
+- A grid-based layout engine which handles positioning, sizing, and alignment of components
+- "Components", such as LineRenderer or Axis, which process data and can be connected to d3 Scales
+- "Interactions", such as PanZoomInteraction or AreaInteraction, which easily allow for custom logic to be bound to common interaction patterns
 
+By virtue of being higher-level than D3, it is often much easier to create charts in Plottable.js, with less of a learning curve. Many stylistic changes that would be a pain in D3 (e.g. changing font sizes) are trivially easy in Plottable.js (change the CSS and everything updates). On the other hand, if you want the full power and expressivity of D3, you can just write a new Component plugin in D3, and still get all fo the benefits of Plottable's layout engine and other components.
+
+Plottable.js is being developed by Palantir Technologies. It's developed in Typescript, and released in Javascript. Plottable is currently in alpha and the API is not yet stable.
 
 =========
 Setup Instructions:

From 41f3609b0efb61e0980a3157583ae89b580c11a0 Mon Sep 17 00:00:00 2001
From: Daniel Mane <danmane@gmail.com>
Date: Mon, 24 Feb 2014 12:10:05 -0800
Subject: [PATCH 10/11] Fix typo in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a86da95ddc..0ae9457354 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Plottable consists of three main pieces:
 - "Components", such as LineRenderer or Axis, which process data and can be connected to d3 Scales
 - "Interactions", such as PanZoomInteraction or AreaInteraction, which easily allow for custom logic to be bound to common interaction patterns
 
-By virtue of being higher-level than D3, it is often much easier to create charts in Plottable.js, with less of a learning curve. Many stylistic changes that would be a pain in D3 (e.g. changing font sizes) are trivially easy in Plottable.js (change the CSS and everything updates). On the other hand, if you want the full power and expressivity of D3, you can just write a new Component plugin in D3, and still get all fo the benefits of Plottable's layout engine and other components.
+By virtue of being higher-level than D3, it is often much easier to create charts in Plottable.js, with less of a learning curve. Stylistic changes that would be a pain in D3 (e.g. changing font sizes) are trivially easy in Plottable.js (change the CSS and everything updates). On the other hand, if you want the full power and expressivity of D3, you can just write a new Component plugin in D3, and still get all of the benefits of Plottable's layout engine and other components.
 
 Plottable.js is being developed by Palantir Technologies. It's developed in Typescript, and released in Javascript. Plottable is currently in alpha and the API is not yet stable.
 

From 742061c3a5f155bc83b00a8579183ebc8443c97d Mon Sep 17 00:00:00 2001
From: Daniel Mane <danmane@gmail.com>
Date: Mon, 24 Feb 2014 12:12:01 -0800
Subject: [PATCH 11/11] Bump version for 0.1.4, also change description in
 package.json

---
 bower.json         | 2 +-
 license_header.txt | 2 +-
 package.json       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bower.json b/bower.json
index d662150d5b..9afcda7e69 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "plottable.js",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "dependencies": {
     "d3": "3.4.1"
   },
diff --git a/license_header.txt b/license_header.txt
index 9d72e873a4..a0c1ab817e 100644
--- a/license_header.txt
+++ b/license_header.txt
@@ -1,5 +1,5 @@
 /*!
-Plottable v0.1.3 (https://github.com/palantir/plottable)
+Plottable v0.1.4 (https://github.com/palantir/plottable)
 Copyright 2014 Palantir Technologies
 Licensed under MIT (https://github.com/palantir/plottable/blob/master/LICENSE)
 */
diff --git a/package.json b/package.json
index c994c0baa3..71b458d8de 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "plottable.js",
-  "version": "0.1.3",
-  "description": "A library for easily creating charts within a grid layout.",
+  "version": "0.1.4",
+  "description": "Build flexible, performant, interactive charts using D3",
   "repository": {
     "type": "git",
     "url": "https://github.com/palantir/plottable.git"
