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

use relative paths for custom/inner.* and outer.*

Browse source
This commit is contained in:
Sofian Benaissa 2012-03-20 22:16:01 -04:00
parent 5d7a1734a4
commit 80c9d9c948
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
static/js/ace.js
View file

@ -265,8 +265,8 @@ function Ace2Editor()
pushScriptsTo(iframeHTML); pushScriptsTo(iframeHTML);
iframeHTML.push('<style type="text/css" title="dynamicsyntax"></style>'); iframeHTML.push('<style type="text/css" title="dynamicsyntax"></style>');
iframeHTML.push('<link rel="stylesheet" type="text/css" href="/static/custom/inner.css"/>'); iframeHTML.push('<link rel="stylesheet" type="text/css" href="../static/custom/inner.css"/>');
iframeHTML.push('<script type="text/javascript" src="/static/custom/inner.js"></script>'); iframeHTML.push('<script type="text/javascript" src="../static/custom/inner.js"></script>');
iframeHTML.push('</head><body id="innerdocbody" class="syntax" spellcheck="false">&nbsp;</body></html>'); iframeHTML.push('</head><body id="innerdocbody" class="syntax" spellcheck="false">&nbsp;</body></html>');
// Expose myself to global for my child frame. // Expose myself to global for my child frame.
@ -287,7 +287,7 @@ function Ace2Editor()
// bizarrely, in FF2, a file with no "external" dependencies won't finish loading properly // bizarrely, in FF2, a file with no "external" dependencies won't finish loading properly
// (throbs busy while typing) // (throbs busy while typing)
outerHTML.push('<link rel="stylesheet" type="text/css" href="data:text/css,"/><link rel="stylesheet" type="text/css" href="/static/custom/outer.css"/>', '\x3cscript>\n', outerScript.replace(/<\//g, '<\\/'), '\n\x3c/script>', '</head><body id="outerdocbody"><div id="sidediv"><!-- --></div><div id="linemetricsdiv">x</div><div id="overlaysdiv"><!-- --></div></body><script type="text/javascript" src="/static/custom/outer.js"></script></html>'); outerHTML.push('<link rel="stylesheet" type="text/css" href="data:text/css,"/><link rel="stylesheet" type="text/css" href="../static/custom/outer.css"/>', '\x3cscript>\n', outerScript.replace(/<\//g, '<\\/'), '\n\x3c/script>', '</head><body id="outerdocbody"><div id="sidediv"><!-- --></div><div id="linemetricsdiv">x</div><div id="overlaysdiv"><!-- --></div></body><script type="text/javascript" src="../static/custom/outer.js"></script></html>');
var outerFrame = document.createElement("IFRAME"); var outerFrame = document.createElement("IFRAME");
outerFrame.frameBorder = 0; // for IE outerFrame.frameBorder = 0; // for IE