mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Provide filename to isolation function.

Browse source
This commit is contained in:
Chad Weider 2012-01-15 22:56:41 -08:00
parent 8bf0e7c2aa
commit 71dfced06d
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
node/utils/Minify.js
View file

@ -179,7 +179,8 @@ function _handle(req, res, jsFilename, jsFiles) {
if(type == "JS") if(type == "JS")
{ {
embeds[filename] = compressJS([isolateJS(data)]); var shortFilename = filename.replace(/^..\/static\/js\//, '');
embeds[filename] = compressJS([isolateJS(data, shortFilename)]);
} }
else else
{ {
@ -297,14 +298,14 @@ function tarCode(filesInOrder, files, write) {
for(var i = 0, ii = filesInOrder.length; i < filesInOrder.length; i++) { for(var i = 0, ii = filesInOrder.length; i < filesInOrder.length; i++) {
var filename = filesInOrder[i]; var filename = filesInOrder[i];
write("\n\n\n/*** File: static/js/" + filename + " ***/\n\n\n"); write("\n\n\n/*** File: static/js/" + filename + " ***/\n\n\n");
write(isolateJS(files[filename])); write(isolateJS(files[filename], filename));
} }
} }
// Wrap the following code in a self executing function and assign exports to // Wrap the following code in a self executing function and assign exports to
// global. This is a first step towards removing symbols from the global scope. // global. This is a first step towards removing symbols from the global scope.
// exports is global and require is a function that returns global. // exports is global and require is a function that returns global.
function isolateJS(code) { function isolateJS(code, filename) {
return '(function (exports, require) {' return '(function (exports, require) {'
+ code + '\n' + code + '\n'
+ '}(function () {return this}(), (function (path) {return (function () {return this}())})));\n'; + '}(function () {return this}(), (function (path) {return (function () {return this}())})));\n';