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

Merge 80c9d9c948 into cfb58a80a3

Browse source
This commit is contained in:
GitHub Merge Button 2012-03-20 19:30:42 -07:00
commit 9f8aa6a284
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/installDeps.sh
View file

@ -96,7 +96,7 @@ rm -f var/minified*
echo "ensure custom css/js files are created..." echo "ensure custom css/js files are created..."
for f in "index" "pad" "timeslider" for f in "index" "pad" "timeslider" "inner" "outer"
do do
if [ ! -f "static/custom/$f.js" ]; then if [ ! -f "static/custom/$f.js" ]; then
cp -v "static/custom/js.template" "static/custom/$f.js" || exit 1 cp -v "static/custom/js.template" "static/custom/$f.js" || exit 1

4
static/js/ace.js
View file

@ -265,6 +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('<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.
@ -285,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,"/>', '\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></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

4
static/js/pad_editor.js
View file

@ -87,8 +87,6 @@ var padeditor = (function()
return defaultValue; return defaultValue;
} }
self.ace.setProperty("showsauthorcolors", !settings.noColors);
self.ace.setProperty("rtlIsTrue", settings.rtlIsTrue); self.ace.setProperty("rtlIsTrue", settings.rtlIsTrue);
var v; var v;
@ -100,6 +98,8 @@ var padeditor = (function()
v = getOption('showAuthorColors', true); v = getOption('showAuthorColors', true);
self.ace.setProperty("showsauthorcolors", v); self.ace.setProperty("showsauthorcolors", v);
padutils.setCheckbox($("#options-colorscheck"), v); padutils.setCheckbox($("#options-colorscheck"), v);
// Override from parameters
self.ace.setProperty("showsauthorcolors", !settings.noColors);
v = getOption('useMonospaceFont', false); v = getOption('useMonospaceFont', false);
self.ace.setProperty("textface", (v ? "monospace" : "Arial, sans-serif")); self.ace.setProperty("textface", (v ? "monospace" : "Arial, sans-serif"));