upgrade jsdom to newest stable 1.5.0

theVolary · Dec 23, 2014 · 1cc6d8c · 1cc6d8c
1 parent 2c44bca
commit 1cc6d8c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/lib/dom.js b/lib/dom.js
@@ -72,9 +72,9 @@ var DomManager = exports.DomManager = function() {
  */
 DomManager.prototype = {
 
-  getResource: function(cb) {
+  getResource: function(options, cb) {
     var me = this,
-      dom = new DomResource();
+      dom = new DomResource(options);
     dom.onceState("ready", function() {
       me.domResourceCount++;
       cb(dom);

diff --git a/lib/parser.js b/lib/parser.js
@@ -61,8 +61,7 @@ var parseFile = exports.parseFile = function(options, cb) {
 
           html = html.replace(/<resources ?\/>/, '<resources></resources>');
 
-          domManager.getResource(function(dom) {
-            dom.document.innerHTML = html;
+          domManager.getResource({html: html}, function(dom) {
 
             Widget.render({
               dom: dom,
@@ -133,7 +132,7 @@ var parseFile = exports.parseFile = function(options, cb) {
                       }
 
                       //cache resulting html
-                      var _html = dom.document.innerHTML;
+                      var _html = dom.document.documentElement.outerHTML;
                       _html = _html
                         .replace(/\<\/?resources[^\>]*\>/g, "")
                         .replace(/(\<\/?)clientscript/g, "$1script")
@@ -239,7 +238,7 @@ var parseWidget = exports.parseWidget = function(options, cb) {
         path = options.path,
         req = options.request;
 
-      domManager.getResource(function(dom) {
+      domManager.getResource({}, function(dom) {
         var document = dom.document,
           $j = dom.$j;
 

diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "github-flavored-markdown": "~1.0.1",
     "heapdump": "~0.2.7",
     "inherits": "~1.0.0",
-    "jsdom": "~0.8.9",
+    "jsdom": "1.5.0",
     "knox": "~0.8.8",
     "multer": "0.0.5",
     "node-uuid": "~1.4.1",