Merge remote-tracking branch 'remotes/upstream/master'

.npmignore

@@ -0,0 +1,3 @@
+examples/
+test/
+.DS_Store

examples/vega/lifelines.json

@@ -7,7 +7,7 @@
     {
       "name": "people",
       "values": [
-        {"label":"Washington", "born":-7506057600000, "died":-5365324800000, 
+        {"label":"Washington", "born":-7506057600000, "died":-5366196000000, 
          "enter":-5701424400000, "leave":-5453884800000},
         {"label":"Adams",      "born":-7389766800000, "died":-4528285200000, 
          "enter":-5453884800000, "leave":-5327740800000},

index.js

@@ -1,16 +1,20 @@
-var globals = ["vg"],
+// cache pre-existing global values
+var globals = ["vg", "d3"],
     globalValues = {};
 
 globals.forEach(function(g) {
   if (g in global) globalValues[g] = global[g];
 });
 
-// Namespace pollution!
+// ensure availability of d3 in global namespace
+// NOTE: will "pollute" namespace with jsdom window, etc
 d3 = require("d3");
 
+// load and export vega
 require("./vega");
 module.exports = vg;
 
+// restore pre-existing global values
 globals.forEach(function(g) {
   if (g in globalValues) global[g] = globalValues[g];
   else delete global[g];

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vega",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Vega Runtime",
   "keywords": [
     "vega",

src/_package.js

@@ -1,7 +1,7 @@
 var vg = {};
 
 // semantic versioning
-vg.version = '1.1.0';
+vg.version = '1.1.1';
 
 // type checking functions
 var toString = Object.prototype.toString;

src/core/_end.js

@@ -1,2 +1,2 @@
 return vg;
-})();
+})(d3); // assumes availability of D3 in global namespace

src/core/_start.js

@@ -1 +1 @@
-vg = (function(){
+vg = (function(d3){ // take d3 instance as sole import

vega.js

@@ -1,8 +1,8 @@
-vg = (function(){
+vg = (function(d3){ // take d3 instance as sole import
 var vg = {};
 
 // semantic versioning
-vg.version = '1.1.0';
+vg.version = '1.1.1';
 
 // type checking functions
 var toString = Object.prototype.toString;
@@ -4141,4 +4141,4 @@ vg.spec = function(s) {
   return new vg.Spec(s);
 };
 return vg;
-})();
+})(d3); // assumes availability of D3 in global namespace