mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-10 08:55:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 7ec09c4bbe into e9e4d65ad4

Browse source
This commit is contained in:
John McLear 2012-12-02 10:04:27 -08:00
commit 489cf7ce2c
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/handler/ImportHandler.js
View file

@ -196,6 +196,6 @@ 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.top.require('/pad_impexp').padimpexp.handleFrameCall('" + status + "');</script>", 200);
res.send("<script type="text/javascript" src="../static/js/require-kernel.js"></script><script>$ = jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery; 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);
});
}