From 852452e4ee54eee92d4afedc1051cdfdc6a3229c Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 1 Nov 2014 20:57:00 +0000 Subject: [PATCH] use latest jsdom --- src/node/utils/ImportHtml.js | 4 +--- src/package.json | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/node/utils/ImportHtml.js b/src/node/utils/ImportHtml.js index abba2ac19..e2629791d 100644 --- a/src/node/utils/ImportHtml.js +++ b/src/node/utils/ImportHtml.js @@ -14,10 +14,8 @@ * limitations under the License. */ -var jsdom = require('jsdom-nocontextifiy').jsdom; +var jsdom = require('jsdom').jsdom; var log4js = require('log4js'); - - var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var contentcollector = require("ep_etherpad-lite/static/js/contentcollector"); diff --git a/src/package.json b/src/package.json index 652aebaf8..b035da88b 100644 --- a/src/package.json +++ b/src/package.json @@ -25,7 +25,7 @@ "formidable" : "1.0.9", "log4js" : "0.6.6", "nodemailer" : "0.3.x", - "jsdom-nocontextifiy" : "0.2.10", + "jsdom" : ">=1.1.0", "async-stacktrace" : "0.0.2", "npm" : "1.4.x", "ejs" : "0.6.1",