use require for jquery, pretty ghetto but works better(ish)

This commit is contained in:
John McLear 2012-12-02 18:03:06 +00:00
parent e9e4d65ad4
commit 7ec09c4bbe

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);
});
}