diff options
| author | Peter 'Pita' Martischka <petermartischka - googlemail - com> | 2012-01-30 01:56:02 -0800 |
|---|---|---|
| committer | Peter 'Pita' Martischka <petermartischka - googlemail - com> | 2012-01-30 01:56:02 -0800 |
| commit | 4d714cee94351d8feceeed851721485cc945928b (patch) | |
| tree | 9aafd39ce35b391e23b1bfe4e788b8d48fec4621 /node | |
| parent | 2aba2db93735f5f4c38d8edac4bafe5983c258f9 (diff) | |
| parent | a408557a0ed84cfda81a0b6414a3cf56d4d88e64 (diff) | |
| download | etherpad-lite-4d714cee94351d8feceeed851721485cc945928b.zip | |
Merge pull request #371 from cweider/page-initialization
Page initialization
Diffstat (limited to 'node')
| -rw-r--r-- | node/utils/Minify.js | 5 | ||||
| -rw-r--r-- | node/utils/tar.json | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/node/utils/Minify.js b/node/utils/Minify.js index ea7834dc..98774d19 100644 --- a/node/utils/Minify.js +++ b/node/utils/Minify.js @@ -306,11 +306,6 @@ function tarCode(filesInOrder, files, write) { write("\n\n\n/*** File: static/js/" + filename + " ***/\n\n\n"); write(isolateJS(files[filename], filename)); } - - for(var i = 0, ii = filesInOrder.length; i < filesInOrder.length; i++) { - var filename = filesInOrder[i]; - write('require(' + JSON.stringify('/' + filename.replace(/^\/+/, '')) + ');\n'); - } } // Wrap the following code in a self executing function and assign exports to diff --git a/node/utils/tar.json b/node/utils/tar.json index fd285b94..e1e6fb2b 100644 --- a/node/utils/tar.json +++ b/node/utils/tar.json @@ -1,6 +1,7 @@ { "pad.js": [ "jquery.js" + , "pad.js" , "ace2_common.js" , "pad_utils.js" , "plugins.js" @@ -17,7 +18,6 @@ , "pad_impexp.js" , "pad_savedrevs.js" , "pad_connectionstatus.js" - , "pad2.js" , "jquery-ui.js" , "chat.js" , "excanvas.js" @@ -46,5 +46,6 @@ , "broadcast.js" , "broadcast_slider.js" , "broadcast_revisions.js" + , "timeslider.js" ] } |