Fix up a few breakages in v3.3.0.

UpbeatPR · Sep 18, 2010 · 1a61bac · 1a61bac
1 parent f3e649e
commit 1a61bac
Show file tree

Hide file tree

Showing 257 changed files with 277 additions and 300 deletions.
diff --git a/examples/antibiotics/antibiotics-scatter.html b/examples/antibiotics/antibiotics-scatter.html
@@ -2,7 +2,7 @@
   <head>
     <title>Antibiotic Effectiveness</title>
     <link type="text/css" rel="stylesheet" href="../ex.css"/>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script type="text/javascript" src="antibiotics.js"></script>
     <style type="text/css">
 

diff --git a/examples/antibiotics/antibiotics.html b/examples/antibiotics/antibiotics.html
@@ -2,7 +2,7 @@
   <head>
     <title>Antibiotic Effectiveness</title>
     <link type="text/css" rel="stylesheet" href="../ex.css"/>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script type="text/javascript" src="antibiotics.js"></script>
     <style type="text/css">
 

diff --git a/examples/barley/barley.html b/examples/barley/barley.html
@@ -2,7 +2,7 @@
   <head>
     <title>Barley Yields</title>
     <link type="text/css" rel="stylesheet" href="../ex.css"/>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script type="text/javascript" src="barley.js"></script>
     <style type="text/css">
 
@@ -54,6 +54,7 @@
 
 /* Title bar. */
 cell.add(pv.Bar)
+    .top(0)
     .height(14)
     .fillStyle("bisque")
   .anchor("center").add(pv.Label)

diff --git a/examples/cars/cars.html b/examples/cars/cars.html
@@ -2,7 +2,7 @@
   <head>
     <title>Cars</title>
     <link type="text/css" rel="stylesheet" href="../ex.css"/>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script type="text/javascript" src="cars.js"></script>
     <style type="text/css">
 

diff --git a/examples/clock/clock.html b/examples/clock/clock.html
@@ -2,7 +2,7 @@
   <head>
     <title>PolarClock</title>
     <link type="text/css" rel="stylesheet" href="../ex.css"/>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <style type="text/css">
 
 body {

diff --git a/examples/crimea/crimea-grouped-bar.html b/examples/crimea/crimea-grouped-bar.html
@@ -2,7 +2,7 @@
   <head>
     <title>Crimean War</title>
     <link type="text/css" rel="stylesheet" href="../ex.css"/>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script type="text/javascript" src="crimea.js"></script>
     <style type="text/css">
 

diff --git a/examples/crimea/crimea-line.html b/examples/crimea/crimea-line.html
@@ -2,7 +2,7 @@
   <head>
     <title>Crimean War</title>
     <link type="text/css" rel="stylesheet" href="../ex.css"/>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script type="text/javascript" src="crimea.js"></script>
     <style type="text/css">
 

diff --git a/examples/crimea/crimea-stacked-area.html b/examples/crimea/crimea-stacked-area.html
@@ -2,7 +2,7 @@
   <head>
     <title>Crimean War</title>
     <link type="text/css" rel="stylesheet" href="../ex.css"/>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script type="text/javascript" src="crimea.js"></script>
     <style type="text/css">
 

diff --git a/examples/crimea/crimea-stacked-bar.html b/examples/crimea/crimea-stacked-bar.html
@@ -2,7 +2,7 @@
   <head>
     <title>Crimean War</title>
     <link type="text/css" rel="stylesheet" href="../ex.css"/>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script type="text/javascript" src="crimea.js"></script>
     <style type="text/css">
 

diff --git a/examples/crimea/crimea.html b/examples/crimea/crimea.html
@@ -2,7 +2,7 @@
   <head>
     <title>Crimean War</title>
     <link type="text/css" rel="stylesheet" href="../ex.css"/>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script type="text/javascript" src="crimea.js"></script>
     <style type="text/css">
 

diff --git a/examples/downloadify/downloadify.html b/examples/downloadify/downloadify.html
@@ -3,7 +3,7 @@
     <title>Downloadify</title>
     <script type="text/javascript" src="swfobject.js"></script>
     <script type="text/javascript" src="downloadify.min.js"></script>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <link type="text/css" href="../../tests/style.css" rel="stylesheet"/>
   </head>
   <body>

diff --git a/examples/eyes/eyes.html b/examples/eyes/eyes.html
@@ -2,7 +2,7 @@
   <head>
     <title>My God, it's full of eyes!</title>
     <link rel="stylesheet" type="text/css" href="../ex.css"/>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <style type="text/css">
 
 body {
@@ -34,6 +34,8 @@
     .left(function(d) d.x)
     .top(function(d) d.y)
   .add(pv.Dot)
+    .left(0)
+    .top(0)
     .fillStyle("#fff")
     .strokeStyle(null)
     .radius(function(d) d.r)

diff --git a/examples/eyes/matrix.html b/examples/eyes/matrix.html
@@ -2,7 +2,7 @@
   <head>
     <title>Matrix</title>
     <link rel="stylesheet" type="text/css" href="../ex.css"/>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <style type="text/css">
 
 body {
@@ -31,6 +31,8 @@
     .data(pv.range(0, 201, 20))
     .top(function(y) y)
   .add(pv.Dot)
+    .left(0)
+    .top(0)
     .fillStyle("#fff")
     .strokeStyle(null)
     .size(function() this.mouse().length());

diff --git a/examples/flowers/flowers.html b/examples/flowers/flowers.html
@@ -2,7 +2,7 @@
   <head>
     <title>Iris Flowers</title>
     <link type="text/css" rel="stylesheet" href="../ex.css"/>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script type="text/javascript" src="flowers.js"></script>
     <style type="text/css">
 

diff --git a/examples/group-stack/group-stack.html b/examples/group-stack/group-stack.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>Group Stacked Bar Chart</title>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script type="text/javascript" src="headcount.js"></script>
   </head>
   <body>

diff --git a/examples/hotel/hotel.html b/examples/hotel/hotel.html
@@ -2,7 +2,7 @@
   <head>
     <title>Hotel Stays</title>
     <link type="text/css" rel="stylesheet" href="../ex.css"/>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script type="text/javascript" src="hotel.js"></script>
     <style type="text/css">
 

diff --git a/examples/jobs/jobs.html b/examples/jobs/jobs.html
@@ -2,7 +2,7 @@
   <head>
     <title>Job Voyager</title>
     <link type="text/css" rel="stylesheet" href="../ex.css"/>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script type="text/javascript" src="jobs.js"></script>
     <style type="text/css">
 

diff --git a/examples/nba/nba.html b/examples/nba/nba.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>NBA per game performance of top 50 scorers</title>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script type="text/javascript" src="nba.js"></script>
     <style type="text/css">
 
@@ -62,11 +62,13 @@ <h1>NBA per game performance of top 50 scorers</h1>
 vis.add(pv.Label)
     .data(cols)
     .left(function() this.index * w + w / 2)
+    .top(0)
     .textAngle(-Math.PI / 2)
     .textBaseline("middle");
 
 vis.add(pv.Label)
     .data(nba)
+    .left(0)
     .top(function() this.index * h + h / 2)
     .textAlign("right")
     .textBaseline("middle")

diff --git a/examples/nba/nba2.html b/examples/nba/nba2.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>NBA per game performance of top 50 scorers</title>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script type="text/javascript" src="nba.js"></script>
     <style type="text/css">
 
@@ -61,11 +61,13 @@ <h1>NBA per game performance of top 50 scorers</h1>
 vis.add(pv.Label)
     .data(cols)
     .left(function() this.index * w + w / 2)
+    .top(0)
     .textAngle(-Math.PI / 2)
     .textBaseline("middle");
 
 vis.add(pv.Label)
     .data(nba)
+    .left(0)
     .top(function() this.index * h + h / 2)
     .textAlign("right")
     .textBaseline("middle")

diff --git a/examples/sankey/sankey.html b/examples/sankey/sankey.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>GDP of the World</title>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script type="text/javascript" src="gdp2009.js"></script>
   </head>
   <body>

diff --git a/examples/slider/cell.html b/examples/slider/cell.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>Automaton Explorer</title>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
 		<script type="text/javascript" src="../jquery-1.4.2.min.js"></script>
 		<script type="text/javascript" src="jquery-ui-1.8rc3.custom.min.js"></script>
     <script type="text/javascript" src="cell.js"></script>

diff --git a/examples/slider/horizon.html b/examples/slider/horizon.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>Horizon Explorer</title>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
 		<script type="text/javascript" src="../jquery-1.4.2.min.js"></script>
 		<script type="text/javascript" src="jquery-ui-1.8rc3.custom.min.js"></script>
 		<link type="text/css" href="ui-lightness/jquery-ui-1.8rc3.custom.css" rel="stylesheet"/>

diff --git a/examples/slider/slider.html b/examples/slider/slider.html
@@ -1,7 +1,7 @@
 <html>
 	<head>
 		<title>Slider</title>
-		<script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+		<script type="text/javascript" src="../../protovis.js"></script>
 		<script type="text/javascript" src="../jquery-1.4.2.min.js"></script>
 		<script type="text/javascript" src="jquery-ui-1.8rc3.custom.min.js"></script>
 		<link type="text/css" href="ui-lightness/jquery-ui-1.8rc3.custom.css" rel="stylesheet"/>

diff --git a/examples/tipsy/tipsy-bar.html b/examples/tipsy/tipsy-bar.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="../../protovis.js?3.3.0" type="text/javascript"></script>
+    <script src="../../protovis.js" type="text/javascript"></script>
     <script src="../jquery-1.4.2.min.js" type="text/javascript"></script>
     <script src="jquery.tipsy.js" type="text/javascript"></script>
     <script src="tipsy.js" type="text/javascript"></script>

diff --git a/examples/tipsy/tipsy-line.html b/examples/tipsy/tipsy-line.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Tipsy Line</title>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script src="../jquery-1.4.2.min.js" type="text/javascript"></script>
     <script src="jquery.tipsy.js" type="text/javascript"></script>
     <script src="tipsy.js" type="text/javascript"></script>

diff --git a/examples/weather/weather.html b/examples/weather/weather.html
@@ -2,7 +2,7 @@
   <head>
     <title>Weather</title>
     <link type="text/css" rel="stylesheet" href="../ex.css"/>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script type="text/javascript" src="weather.js"></script>
     <style type="text/css">
 

diff --git a/examples/wheat/wheat.html b/examples/wheat/wheat.html
@@ -2,7 +2,7 @@
   <head>
     <title>Wheat &amp; Wages</title>
     <link type="text/css" rel="stylesheet" href="../ex.css"/>
-    <script type="text/javascript" src="../../protovis.js?3.3.0"></script>
+    <script type="text/javascript" src="../../protovis.js"></script>
     <script type="text/javascript" src="wheat.js"></script>
     <style type="text/css">
 

diff --git a/protovis.js b/protovis.js
@@ -127,7 +127,7 @@ var pv = {};
  * @type string
  * @constant
  */
-pv.version = "3.3.0";
+pv.version = "3.3.1";
 
 /**
  * Returns the passed-in argument, <tt>x</tt>; the identity function. This method
@@ -6754,18 +6754,12 @@ pv.Mark.prototype.anchor = function(name) {
   if (!name) name = "center"; // default anchor name
   return new pv.Anchor(this)
     .name(name)
-    .def("$mark.anchor", function() {
-        scene = this.scene.target = instances(this);
-      })
     .data(function() {
         return this.scene.target.map(function(s) { return s.data; });
       })
     .visible(function() {
         return this.scene.target[this.index].visible;
       })
-    .id(function() {
-        return this.scene.target[this.index].id;
-      })
     .left(function() {
         var s = this.scene.target[this.index], w = s.width || 0;
         switch (this.name()) {
@@ -7795,11 +7789,7 @@ pv.Area.prototype.buildInstance = function(s) {
  * @returns {pv.Anchor}
  */
 pv.Area.prototype.anchor = function(name) {
-  var scene;
   return pv.Mark.prototype.anchor.call(this, name)
-    .def("$area.anchor", function() {
-        scene = this.scene.target;
-      })
     .interpolate(function() {
        return this.scene.target[this.index].interpolate;
       })
@@ -8050,11 +8040,7 @@ pv.Dot.prototype.defaults = new pv.Dot()
  * @returns {pv.Anchor}
  */
 pv.Dot.prototype.anchor = function(name) {
-  var scene;
   return pv.Mark.prototype.anchor.call(this, name)
-    .def("$wedge.anchor", function() {
-        scene = this.scene.target;
-      })
     .left(function() {
         var s = this.scene.target[this.index];
         switch (this.name()) {
@@ -9200,11 +9186,7 @@ pv.Wedge.prototype.anchor = function(name) {
   function partial(s) { return s.innerRadius || s.angle < 2 * Math.PI; }
   function midRadius(s) { return (s.innerRadius + s.outerRadius) / 2; }
   function midAngle(s) { return (s.startAngle + s.endAngle) / 2; }
-  var scene;
   return pv.Mark.prototype.anchor.call(this, name)
-    .def("$wedge.anchor", function() {
-        scene = this.scene.target;
-      })
     .left(function() {
         var s = this.scene.target[this.index];
         if (partial(s)) switch (this.name()) {