diff --git a/node/minify.js b/node/minify.js index b6f670bdf..d7890f5c7 100644 --- a/node/minify.js +++ b/node/minify.js @@ -231,9 +231,17 @@ exports.padJS = function(req, res) //minifying is disabled, so load the files with jquery else { + res.write("function loadjsfile(filename){\n"+ + "var fileref=document.createElement('script');\n"+ + "fileref.setAttribute('type','text/javascript');\n"+ + "var path = 'static/js/' + filename;\n"+ + "fileref.setAttribute('src', path);\n" + + "document.getElementsByTagName('head')[0].appendChild(fileref);\n" + + "}\n"); + for(var i in jsFiles) { - res.write("$.getScript('/static/js/" + jsFiles[i]+ "');\n"); + res.write("loadjsfile('"+ jsFiles[i] + "');\n"); } res.end(); diff --git a/node/server.js b/node/server.js index 5b2c904ba..4887f24fd 100644 --- a/node/server.js +++ b/node/server.js @@ -81,6 +81,20 @@ async.waterfall([ res.sendfile(filePath, { maxAge: exports.maxAge }); }); + //if minified is disabled, we need to server the static files under /p/static too + //it looks like dynamic script loading works only for subfolders, thats the reason we're doing this + if(settings.minify == false) + { + //serve static files + app.get('/p/static/*', function(req, res) + { + res.header("Server", serverName); + var filePath = path.normalize(__dirname + "/.." + req.url.split("?")[0].replace("p/","")); + console.error(filePath); + res.sendfile(filePath, { maxAge: exports.maxAge }); + }); + } + //serve minified files app.get('/minified/:id', function(req, res) { @@ -149,7 +163,7 @@ async.waterfall([ //serve pad.html under /p app.get('/p/:pad', function(req, res, next) - { + { //ensure the padname is valid and the url doesn't end with a / if(!isValidPadname(req.params.pad) || /\/$/.test(req.url)) { diff --git a/static/pad.html b/static/pad.html index 928a3629f..a9e5e7919 100644 --- a/static/pad.html +++ b/static/pad.html @@ -125,7 +125,7 @@ We removed this feature cause its not worth the space it needs in the editbar