libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #987 from cweider/loopback-avoidance

Browse source 
Windows server fixes
This commit is contained in:
John McLear 2012-09-09 15:50:42 -07:00
commit 32b4729305
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/node/utils/Minify.js
View file

@ -144,6 +144,7 @@ function minify(req, res, next)
if (plugin) {
var pluginPath = plugin.package.realPath;
filename = path.relative(ROOT_DIR, pluginPath + '/static/' + resourcePath);
filename = filename.replace(/\\/g, '/'); // Windows (safe generally?)
}
}

19
src/static/js/ace.js
View file

@ -173,22 +173,6 @@ require.setGlobalKeyPath("require");\n\
throw new Error("Require script could not be embedded.");
}
}
function pushScriptsTo(buffer) {
/* Folling is for packaging regular expression. */
/* $$INCLUDE_JS("../javascripts/lib/ep_etherpad-lite/static/js/ace2_inner.js?callback=require.define"); */
/* $$INCLUDE_JS("../javascripts/lib/ep_etherpad-lite/static/js/ace2_common.js?callback=require.define"); */
var ACE_SOURCE = '../javascripts/lib/ep_etherpad-lite/static/js/ace2_inner.js?callback=require.define';
var ACE_COMMON = '../javascripts/lib/ep_etherpad-lite/static/js/ace2_common.js?callback=require.define';
if (Ace2Editor.EMBEDED && Ace2Editor.EMBEDED[ACE_SOURCE]) {
buffer.push('<script type="text/javascript">');
buffer.push(Ace2Editor.EMBEDED[ACE_SOURCE]);
buffer.push(Ace2Editor.EMBEDED[ACE_COMMON]);
buffer.push('<\/script>');
} else {
buffer.push('<script type="application/javascript" src="' + ACE_SOURCE + '"><\/script>');
buffer.push('<script type="application/javascript" src="' + ACE_COMMON + '"><\/script>');
}
}
function pushStyleTagsFor(buffer, files) {
var sorted = sortFilesByEmbeded(files);
var embededFiles = sorted.embeded;
@ -198,7 +182,7 @@ require.setGlobalKeyPath("require");\n\
buffer.push('<style type="text/css">');
for (var i = 0, ii = embededFiles.length; i < ii; i++) {
var file = embededFiles[i];
buffer.push(Ace2Editor.EMBEDED[file].replace(/<\//g, '<\\/'));
buffer.push((Ace2Editor.EMBEDED[file] || '').replace(/<\//g, '<\\/'));
}
buffer.push('<\/style>');
}
@ -254,7 +238,6 @@ require.setGlobalKeyPath("require");\n\
var includedJS = [];
pushRequireScriptTo(iframeHTML);
pushScriptsTo(iframeHTML);
// Inject my plugins into my child.
iframeHTML.push('\