Cleverly compacted `classed` code.

We can take advantage of JavaScript's invisible hoisting of variables to set
them before they are defined. This simplifies the code for the various special
cases in the `classed` operator, such as for SVG elements and browsers that
support the tokenized class list.

d3.js

@@ -1305,37 +1305,36 @@ function d3_selection(groups) {
     // If no value is specified, return the first value.
     if (arguments.length < 2) {
       return first(function() {
-        var c;
         if (c = this.classList) return c.contains(name);
+        var c = this.className;
         re.lastIndex = 0;
-        return re.test((c = this.className).baseVal != null
+        return re.test(c.baseVal != null ? c.baseVal : c);
-          ? c.baseVal : c);
       });
     }
 
     /** @this {Element} */
     function classedAdd() {
-      var c;
       if (c = this.classList) return c.add(name);
-      var isAnimatedString = (c = this.className).baseVal != null,
+      var c = this.className,
-          classes = isAnimatedString ? c.baseVal : c;
+          cb = c.baseVal != null,
+          cv = cb ? c.baseVal : c;
       re.lastIndex = 0;
-      if (!re.test(classes)) {
+      if (!re.test(cv)) {
-        classes = d3_collapse(classes + " " + name);
+        cv = d3_collapse(cv + " " + name);
-        if (isAnimatedString) c.baseVal = classes;
+        if (cb) c.baseVal = cv;
-        else this.className = classes;
+        else this.className = cv;
       }
     }
 
     /** @this {Element} */
     function classedRemove() {
-      var c;
       if (c = this.classList) return c.remove(name);
-      var isAnimatedString = (c = this.className).baseVal != null,
+      var c = this.className,
-          classes = isAnimatedString ? c.baseVal : c;
+          cb = c.baseVal != null,
-      classes = d3_collapse(classes.replace(re, " "));
+          cv = cb ? c.baseVal : c;
-      if (isAnimatedString) c.baseVal = classes;
+      cv = d3_collapse(cv.replace(re, " "));
-      else this.className = classes;
+      if (cb) c.baseVal = cv;
+      else this.className = cv;
     }
 
     /** @this {Element} */

src/core/selection.js

@@ -305,37 +305,36 @@ function d3_selection(groups) {
     // If no value is specified, return the first value.
     if (arguments.length < 2) {
       return first(function() {
-        var c;
         if (c = this.classList) return c.contains(name);
+        var c = this.className;
         re.lastIndex = 0;
-        return re.test((c = this.className).baseVal != null
+        return re.test(c.baseVal != null ? c.baseVal : c);
-          ? c.baseVal : c);
       });
     }
 
     /** @this {Element} */
     function classedAdd() {
-      var c;
       if (c = this.classList) return c.add(name);
-      var isAnimatedString = (c = this.className).baseVal != null,
+      var c = this.className,
-          classes = isAnimatedString ? c.baseVal : c;
+          cb = c.baseVal != null,
+          cv = cb ? c.baseVal : c;
       re.lastIndex = 0;
-      if (!re.test(classes)) {
+      if (!re.test(cv)) {
-        classes = d3_collapse(classes + " " + name);
+        cv = d3_collapse(cv + " " + name);
-        if (isAnimatedString) c.baseVal = classes;
+        if (cb) c.baseVal = cv;
-        else this.className = classes;
+        else this.className = cv;
       }
     }
 
     /** @this {Element} */
     function classedRemove() {
-      var c;
       if (c = this.classList) return c.remove(name);
-      var isAnimatedString = (c = this.className).baseVal != null,
+      var c = this.className,
-          classes = isAnimatedString ? c.baseVal : c;
+          cb = c.baseVal != null,
-      classes = d3_collapse(classes.replace(re, " "));
+          cv = cb ? c.baseVal : c;
-      if (isAnimatedString) c.baseVal = classes;
+      cv = d3_collapse(cv.replace(re, " "));
-      else this.className = classes;
+      if (cb) c.baseVal = cv;
+      else this.className = cv;
     }
 
     /** @this {Element} */