diff options
| author | John McLear <john@mclear.co.uk> | 2014-11-01 21:12:53 +0000 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2014-11-01 21:12:53 +0000 |
| commit | 1530757d8eec419ac3e4bcd2b507214918a3417b (patch) | |
| tree | bec6b90eb596056563541455d7dfe84de69d8c72 | |
| parent | 9b8398d0bde62885cb7d84b2d3dbffe1581722ef (diff) | |
| parent | ff549db261d0945c08b97a99789624aec96b6fcb (diff) | |
| download | etherpad-lite-1530757d8eec419ac3e4bcd2b507214918a3417b.zip | |
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
| -rw-r--r-- | src/node/utils/ImportHtml.js | 4 | ||||
| -rw-r--r-- | 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 abba2ac1..e2629791 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 652aebaf..b035da88 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", |