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

Merge branch 'master' of /home/jose/etherpad-lite/

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-07-19 20:06:44 +01:00
commit 8b6be1b014
19 changed files with 288 additions and 1849 deletions
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");
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-slide.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
if(settings.minify)
@ -241,6 +241,7 @@ exports.padJS = function(req, res)
for(var i in jsFiles)
{
console.log(jsFiles[i]);
res.write("loadjsfile('"+ jsFiles[i] + "');\n");
}