Merge branch 'tflanagan-master'

ds82 · Aug 31, 2015 · ce5f574 · ce5f574
2 parents f04dfb4 + dc95d98
commit ce5f574
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/lib/xml2js.js b/lib/xml2js.js
diff --git a/package.json b/package.json
@@ -46,7 +46,8 @@
     "Benjamin E. Coe <[email protected]> (https://twitter.com/benjamincoe)",
     "Stephen Cresswell (https://github.com/cressie176)",
     "Pascal Ehlert <[email protected]> (http://www.hacksrus.net/)",
-    "Tom Spencer <[email protected]> (http://fiznool.com/)"
+    "Tom Spencer <[email protected]> (http://fiznool.com/)",
+    "Tristian Flanagan (https://github.com/tflanagan)"
   ],
   "main": "./lib/xml2js",
   "directories": {

diff --git a/src/xml2js.coffee b/src/xml2js.coffee
@@ -5,6 +5,7 @@ events = require 'events'
 builder = require 'xmlbuilder'
 bom = require './bom'
 processors = require './processors'
+setImmediate = require('timers').setImmediate
 
 # Underscore has a nice function for this, but we try to go without dependencies
 isEmpty = (thing) ->