diff options
| author | Peter 'Pita' Martischka <petermartischka@googlemail.com> | 2011-12-04 17:09:31 +0100 |
|---|---|---|
| committer | Peter 'Pita' Martischka <petermartischka@googlemail.com> | 2011-12-04 17:09:31 +0100 |
| commit | bfbdac10d3722e95442cfc186a6c1c8ce70aac43 (patch) | |
| tree | 097101cc49d042a41aa4ef9cb07cb6eeb4562f20 | |
| parent | 5c56e62d67f50df2ddd01fc9af764582945a974a (diff) | |
| download | etherpad-lite-bfbdac10d3722e95442cfc186a6c1c8ce70aac43.zip | |
fixed #250
| -rw-r--r-- | node/utils/ImportHtml.js | 2 | ||||
| -rw-r--r-- | package.json | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/node/utils/ImportHtml.js b/node/utils/ImportHtml.js index 6441708e..1b0bcaea 100644 --- a/node/utils/ImportHtml.js +++ b/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("./Changeset"); diff --git a/package.json b/package.json index 8da9e628..0a73b923 100644 --- a/package.json +++ b/package.json @@ -10,18 +10,18 @@ "name": "Robin Buse"} ], "dependencies" : { - "socket.io" : "0.8.7", - "ueberDB" : "0.1.3", - "async" : "0.1.15", - "joose" : "3.50.0", - "express" : "2.5.0", - "clean-css" : "0.2.4", - "uglify-js" : "1.1.1", - "gzip" : "0.1.0", - "formidable" : "1.0.7", - "log4js" : "0.3.9", - "jsdom" : "0.2.9", - "async-stacktrace": "0.0.2" + "socket.io" : "0.8.7", + "ueberDB" : "0.1.3", + "async" : "0.1.15", + "joose" : "3.50.0", + "express" : "2.5.0", + "clean-css" : "0.2.4", + "uglify-js" : "1.1.1", + "gzip" : "0.1.0", + "formidable" : "1.0.7", + "log4js" : "0.3.9", + "jsdom-nocontextifiy" : "0.2.10", + "async-stacktrace" : "0.0.2" }, "version" : "1.0.0" } |