diff options
| author | John McLear <john@mclear.co.uk> | 2012-05-23 00:46:56 +0200 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2012-05-23 00:46:56 +0200 |
| commit | c8b93f6ddcdda0fbbec65b3ddbed366703066e1a (patch) | |
| tree | e2fec92597e56a544d6cda32270bd0b6dfd472ff /src/node/handler/ImportHandler.js | |
| parent | 9c6731f3b84f7c2410e1f217e97ad0b170260d37 (diff) | |
| download | etherpad-lite-c8b93f6ddcdda0fbbec65b3ddbed366703066e1a.zip | |
Fix IE import
Diffstat (limited to 'src/node/handler/ImportHandler.js')
| -rw-r--r-- | src/node/handler/ImportHandler.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js index ed5eb05e..9eb485fa 100644 --- a/src/node/handler/ImportHandler.js +++ b/src/node/handler/ImportHandler.js @@ -196,6 +196,6 @@ exports.doImport = function(req, res, padId) ERR(err); //close the connection - res.send("<script>document.domain = document.domain; var impexp = window.top.require('/pad_impexp').padimpexp.handleFrameCall('" + status + "'); </script>", 200); + res.send("<script>if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0))){document.domain = document.domain}; var impexp = window.top.require('/pad_impexp').padimpexp.handleFrameCall('" + status + "'); </script>", 200); }); } |