d3 - npm Package Compare versions

Comparing version 2.10.1 to 2.10.3

package.json

 {
   "name": "d3",
-  "version": "2.10.1",
+  "version": "2.10.3",
   "description": "A small, free JavaScript library for manipulating documents based on data.",
@@ -24,2 +24,8 @@ "keywords": [
   "browserify": "index-browserify.js",
+  "jam": {
+    "main": "d3.v2.js",
+    "shim": {
+      "exports": "d3"
+    }
+  },
   "dependencies": {
@@ -26,0 +32,0 @@ "jsdom": "0.2.14",

src/core/core.js

@@ -1,1 +0,1 @@
-d3 = {version: "2.10.1"}; // semver
+d3 = {version: "2.10.3"}; // semver

src/core/hcl.js

@@ -19,20 +19,18 @@ d3.hcl = function(h, c, l) {
 
-d3_Hcl.prototype.brighter = function(k) {
+var d3_hclPrototype = d3_Hcl.prototype = new d3_Color;
+
+d3_hclPrototype.brighter = function(k) {
   return d3_hcl(this.h, this.c, Math.min(100, this.l + d3_lab_K * (arguments.length ? k : 1)));
 };
 
-d3_Hcl.prototype.darker = function(k) {
+d3_hclPrototype.darker = function(k) {
   return d3_hcl(this.h, this.c, Math.max(0, this.l - d3_lab_K * (arguments.length ? k : 1)));
 };
 
-d3_Hcl.prototype.rgb = function() {
+d3_hclPrototype.rgb = function() {
   return d3_hcl_lab(this.h, this.c, this.l).rgb();
 };
 
-d3_Hcl.prototype.toString = function() {
-  return this.rgb() + "";
-};
-
 function d3_hcl_lab(h, c, l) {
   return d3_lab(l, Math.cos(h *= Math.PI / 180) * c, Math.sin(h) * c);
 }

src/core/hsl.js

@@ -18,3 +18,5 @@ d3.hsl = function(h, s, l) {
 
-d3_Hsl.prototype.brighter = function(k) {
+var d3_hslPrototype = d3_Hsl.prototype = new d3_Color;
+
+d3_hslPrototype.brighter = function(k) {
   k = Math.pow(0.7, arguments.length ? k : 1);
@@ -24,3 +26,3 @@ return d3_hsl(this.h, this.s, this.l / k);
 
-d3_Hsl.prototype.darker = function(k) {
+d3_hslPrototype.darker = function(k) {
   k = Math.pow(0.7, arguments.length ? k : 1);
@@ -30,10 +32,6 @@ return d3_hsl(this.h, this.s, k * this.l);
 
-d3_Hsl.prototype.rgb = function() {
+d3_hslPrototype.rgb = function() {
   return d3_hsl_rgb(this.h, this.s, this.l);
 };
 
-d3_Hsl.prototype.toString = function() {
-  return this.rgb().toString();
-};
-
 function d3_hsl_rgb(h, s, l) {
@@ -40,0 +38,0 @@ var m1,

src/core/interpolate.js

@@ -259,4 +259,4 @@ d3.interpolate = function(a, b) {
   function(a, b) { return (typeof a === "string" || typeof b === "string") && d3.interpolateString(a + "", b + ""); },
-  function(a, b) { return (typeof b === "string" ? d3_rgb_names.has(b) || /^(#|rgb\(|hsl\()/.test(b) : b instanceof d3_Rgb || b instanceof d3_Hsl) && d3.interpolateRgb(a, b); },
+  function(a, b) { return (typeof b === "string" ? d3_rgb_names.has(b) || /^(#|rgb\(|hsl\()/.test(b) : b instanceof d3_Color) && d3.interpolateRgb(a, b); },
   function(a, b) { return !isNaN(a = +a) && !isNaN(b = +b) && d3.interpolateNumber(a, b); }
 ];

src/core/lab.js

@@ -27,18 +27,16 @@ d3.lab = function(l, a, b) {
 
-d3_Lab.prototype.brighter = function(k) {
+var d3_labPrototype = d3_Lab.prototype = new d3_Color;
+
+d3_labPrototype.brighter = function(k) {
   return d3_lab(Math.min(100, this.l + d3_lab_K * (arguments.length ? k : 1)), this.a, this.b);
 };
 
-d3_Lab.prototype.darker = function(k) {
+d3_labPrototype.darker = function(k) {
   return d3_lab(Math.max(0, this.l - d3_lab_K * (arguments.length ? k : 1)), this.a, this.b);
 };
 
-d3_Lab.prototype.rgb = function() {
+d3_labPrototype.rgb = function() {
   return d3_lab_rgb(this.l, this.a, this.b);
 };
 
-d3_Lab.prototype.toString = function() {
-  return this.rgb() + "";
-};
-
 function d3_lab_rgb(l, a, b) {
@@ -45,0 +43,0 @@ var y = (l + 16) / 116,

src/core/rgb.js

@@ -18,3 +18,5 @@ d3.rgb = function(r, g, b) {
 
-d3_Rgb.prototype.brighter = function(k) {
+var d3_rgbPrototype = d3_Rgb.prototype = new d3_Color;
+
+d3_rgbPrototype.brighter = function(k) {
   k = Math.pow(0.7, arguments.length ? k : 1);
@@ -35,3 +37,3 @@ var r = this.r,
 
-d3_Rgb.prototype.darker = function(k) {
+d3_rgbPrototype.darker = function(k) {
   k = Math.pow(0.7, arguments.length ? k : 1);
@@ -44,7 +46,7 @@ return d3_rgb(
 
-d3_Rgb.prototype.hsl = function() {
+d3_rgbPrototype.hsl = function() {
   return d3_rgb_hsl(this.r, this.g, this.b);
 };
 
-d3_Rgb.prototype.toString = function() {
+d3_rgbPrototype.toString = function() {
   return "#" + d3_rgb_hex(this.r) + d3_rgb_hex(this.g) + d3_rgb_hex(this.b);
@@ -51,0 +53,0 @@ };

src/core/timer.js

@@ -1,2 +0,4 @@
-var d3_timer_queue = null,
+var d3_timer_id = 0,
+    d3_timer_byId = {},
+    d3_timer_queue = null,
     d3_timer_interval, // is an interval (or frame) active?
@@ -7,6 +9,2 @@ d3_timer_timeout; // is a timeout active?
 d3.timer = function(callback, delay, then) {
-  var found = false,
-      t0,
-      t1 = d3_timer_queue;
-
   if (arguments.length < 3) {
@@ -18,16 +16,11 @@ if (arguments.length < 2) delay = 0;
 
-  // See if the callback's already in the queue.
-  while (t1) {
-    if (t1.callback === callback) {
-      t1.then = then;
-      t1.delay = delay;
-      found = true;
-      break;
-    }
-    t0 = t1;
-    t1 = t1.next;
+  // If the callback's already in the queue, update it.
+  var timer = d3_timer_byId[callback.id];
+  if (timer && timer.callback === callback) {
+    timer.then = then;
+    timer.delay = delay;
   }
 
   // Otherwise, add the callback to the queue.
-  if (!found) d3_timer_queue = {
+  else d3_timer_byId[callback.id = ++d3_timer_id] = d3_timer_queue = {
     callback: callback,
@@ -45,3 +38,3 @@ then: then,
   }
-}
+};
 
@@ -86,3 +79,3 @@ function d3_timer_step() {
 
-// Flush after callbacks, to avoid concurrent queue modification.
+// Flush after callbacks to avoid concurrent queue modification.
 function d3_timer_flush() {
@@ -94,2 +87,3 @@ var t0 = null,
     if (t1.flush) {
+      delete d3_timer_byId[t1.callback.id];
       t1 = t0 ? t0.next = t1.next : d3_timer_queue = t1.next;
@@ -96,0 +90,0 @@ } else {

src/core/tween.js

@@ -7,3 +7,3 @@ d3.tween = function(b, interpolate) {
         ? a != "" && d3_tweenRemove
-        : a != v && interpolate(a, v);
+        : a != v && interpolate(a, v + "");
   }
@@ -10,0 +10,0 @@

src/package.js

@@ -13,2 +13,8 @@ require("./core/core");
   "browserify" : "index-browserify.js",
+  "jam": {
+    "main": "d3.v2.js",
+    "shim": {
+      "exports": "d3"
+    }
+  },
   "dependencies": {
@@ -15,0 +21,0 @@ "jsdom": "0.2.14",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

635203

increased by0.1%

Number of package files

200

increased by1.52%

Lines of code

16056

increased by0.02%

No dependency changes