diff options
| author | John McLear <john@mclear.co.uk> | 2012-12-10 11:34:16 +0000 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2012-12-10 11:34:53 +0000 |
| commit | bf5283fa11089ee03b9a5cdf6b20b7f62fbc01f2 (patch) | |
| tree | e17a83d85018220a5452a8c8f4a107fcf4fbf918 /src/node | |
| parent | f1ca9bb4562a3ac418749b6ea11c5229e51d7b17 (diff) | |
| download | etherpad-lite-bf5283fa11089ee03b9a5cdf6b20b7f62fbc01f2.zip | |
Fix issue #725 which was caused by a race condition
Diffstat (limited to 'src/node')
| -rw-r--r-- | src/node/handler/ImportHandler.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js index db82eac7..5ec07390 100644 --- a/src/node/handler/ImportHandler.js +++ b/src/node/handler/ImportHandler.js @@ -176,6 +176,7 @@ exports.doImport = function(req, res, padId) ERR(err); //close the connection - res.send("<script type='text/javascript' src='/static/js/jquery.js'></script><script> if ( (!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf(\"1.8.\") == 0)) ){document.domain = document.domain;}var impexp = window.parent.require('/pad_impexp').padimpexp.handleFrameCall('" + status + "');</script>", 200); + res.send("<head><script type='text/javascript' src='/static/js/jquery.js'></script></head><script>$(window).load(function(){if ( (!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf(\"1.8.\") == 0)) ){document.domain = document.domain;}var impexp = window.parent.require('/pad_impexp').padimpexp.handleFrameCall('" + status + "');})</script>", 200); }); } + |