Bug fixes and code cleanup

With a lot of help from @robinnorth

index.js

@@ -229,13 +229,15 @@ Pjax.prototype = {
 
       // Update browser history
       this.lastUid = this.maxUid = newUid()
+
+      var state = this.state
       window.history.pushState({
-          url: this.state.href,
-          title: this.state.options.title,
+          url: state.href,
+          title: state.options.title,
           uid: this.maxUid
         },
-        this.state.options.title,
-        this.state.href)
+        state.options.title,
+        state.href)
     }
 
     this.forEachSelectors(function(el) {

lib/switches-selectors.js

@@ -3,6 +3,8 @@ var forEachEls = require("./foreach-els")
 var defaultSwitches = require("./switches")
 
 module.exports = function(switches, switchesOptions, selectors, fromEl, toEl, options) {
+  var switchesQueue = [];
+
   selectors.forEach(function(selector) {
     var newEls = fromEl.querySelectorAll(selector)
     var oldEls = toEl.querySelectorAll(selector)
@@ -25,14 +27,17 @@ module.exports = function(switches, switchesOptions, selectors, fromEl, toEl, op
         this.log("newEl", newEl, "oldEl", oldEl)
       }
 
-      this.state.numPendingSwitches++
+      var callback = (switches[selector]) ?
+        switches[selector].bind(this, oldEl, newEl, options, switchesOptions[selector]) :
+        defaultSwitches.outerHTML.bind(this, oldEl, newEl, options)
 
-      if (switches[selector]) {
-        switches[selector].bind(this)(oldEl, newEl, options, switchesOptions[selector])
-      }
-      else {
-        defaultSwitches.outerHTML.bind(this)(oldEl, newEl, options)
-      }
+      switchesQueue.push(callback)
     }, this)
   }, this)
+
+  this.state.numPendingSwitches = switchesQueue.length
+
+  switchesQueue.forEach(function(queuedSwitch) {
+    queuedSwitch()
+  })
 }

package.json

@@ -38,7 +38,7 @@
     "lint": "jscs . && jshint . --exclude-path .gitignore",
     "standalone": "browserify index.js --standalone Pjax > pjax.js",
     "build-debug": "browserify index.js --debug --standalone Pjax > pjax.js",
-    "tests": "tape -r ./tests/index.js ./tests/**/*.js",
+    "tests": "tape -r ./tests/setup.js ./tests/**/*.js",
     "test": "npm run lint && npm run tests | tap-spec",
     "coverage-tests": "npm run tests | tap-nyc",
     "coverage": "nyc -x \"tests/**\" npm run coverage-tests",