diff options
| author | John McLear <john@mclear.co.uk> | 2014-11-01 21:15:31 +0000 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2014-11-01 21:15:31 +0000 |
| commit | 124ae311379b6e55fe4e550bc06229c37e660879 (patch) | |
| tree | a88ff0a5c13be3f8635f9587125b20da4aa70af5 /src | |
| parent | 1530757d8eec419ac3e4bcd2b507214918a3417b (diff) | |
| download | etherpad-lite-124ae311379b6e55fe4e550bc06229c37e660879.zip | |
blah push back for imports
Diffstat (limited to 'src')
| -rw-r--r-- | src/node/utils/ImportHtml.js | 2 | ||||
| -rw-r--r-- | src/package.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/node/utils/ImportHtml.js b/src/node/utils/ImportHtml.js index e2629791..48188dfd 100644 --- a/src/node/utils/ImportHtml.js +++ b/src/node/utils/ImportHtml.js @@ -14,7 +14,7 @@ * limitations under the License. */ -var jsdom = require('jsdom').jsdom; +var jsdom = require('jsdom-nocontextifiy').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 b035da88..652aebaf 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" : ">=1.1.0", + "jsdom-nocontextifiy" : "0.2.10", "async-stacktrace" : "0.0.2", "npm" : "1.4.x", "ejs" : "0.6.1", |