fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change order of JS, hope to load utils early on, im not sure this is a proper fix though

This commit is contained in:
John McLear 2011-07-19 17:41:04 +01:00 committed by Peter 'Pita' Martischka
parent d9e18f38a3
commit 322a66aab1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
node/minify.js
View File

@ -39,7 +39,7 @@ exports.padJS = function(req, res)
{ {
res.header("Content-Type","text/javascript"); res.header("Content-Type","text/javascript");
var jsFiles = ["jquery.min.js", "plugins.js", "undo-xpopup.js", "json2.js", "pad_utils.js", "pad_cookie.js", "pad_editor.js", "pad_editbar.js", "pad_docbar.js", "pad_modals.js", "ace.js", "collab_client.js", "pad_userlist.js", "pad_impexp.js", "pad_savedrevs.js", "pad_connectionstatus.js", "pad2.js", "jquery-ui.js", "chat.js"]; var jsFiles = ["jquery.min.js", "pad_utils.js", "plugins.js", "undo-xpopup.js", "json2.js", "pad_cookie.js", "pad_editor.js", "pad_editbar.js", "pad_docbar.js", "pad_modals.js", "ace.js", "collab_client.js", "pad_userlist.js", "pad_impexp.js", "pad_savedrevs.js", "pad_connectionstatus.js", "pad2.js", "jquery-ui.js", "chat.js"];
//minifying is enabled //minifying is enabled
if(settings.minify) if(settings.minify)
@ -241,6 +241,7 @@ exports.padJS = function(req, res)
for(var i in jsFiles) for(var i in jsFiles)
{ {
console.log(jsFiles[i]);
res.write("loadjsfile('"+ jsFiles[i] + "');\n"); res.write("loadjsfile('"+ jsFiles[i] + "');\n");
} }