diff options
| author | goldquest <tjwelde@gmail.com> | 2013-04-02 16:42:50 +0200 |
|---|---|---|
| committer | goldquest <tjwelde@gmail.com> | 2013-04-05 15:35:03 +0200 |
| commit | cbf0535f972aaeb9d146507a3827152b56c6ecbd (patch) | |
| tree | 93893fd96902ffb6a787380fa0190f205268a1ba /src | |
| parent | 38f54057a0c83bba40c952a3d496fe557faf9195 (diff) | |
| download | etherpad-lite-cbf0535f972aaeb9d146507a3827152b56c6ecbd.zip | |
browser detection was dropped in jquery 1.9, so we have to add the browser detection js file
Diffstat (limited to 'src')
| -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 7bb9c5db..a155f5c6 100644 --- a/src/node/handler/ImportHandler.js +++ b/src/node/handler/ImportHandler.js @@ -176,7 +176,7 @@ exports.doImport = function(req, res, padId) ERR(err); //close the connection - 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.padimpexp.handleFrameCall('" + status + "');})</script>", 200); + res.send("<head><script type='text/javascript' src='../../static/js/jquery.js'></script><script type='text/javascript' src='../../static/js/jquery_browser.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.padimpexp.handleFrameCall('" + status + "');})</script>", 200); }); } |