diff --git a/bin/installDeps.sh b/bin/installDeps.sh index 270ec98cd..a8bfd5fcd 100755 --- a/bin/installDeps.sh +++ b/bin/installDeps.sh @@ -96,7 +96,7 @@ rm -f var/minified* echo "ensure custom css/js files are created..." -for f in "index" "pad" "timeslider" +for f in "index" "pad" "timeslider" "inner" "outer" do if [ ! -f "static/custom/$f.js" ]; then cp -v "static/custom/js.template" "static/custom/$f.js" || exit 1 diff --git a/static/js/ace.js b/static/js/ace.js index 22d4eaa6e..188ef8e42 100644 --- a/static/js/ace.js +++ b/static/js/ace.js @@ -265,6 +265,8 @@ function Ace2Editor() pushScriptsTo(iframeHTML); iframeHTML.push(''); + iframeHTML.push(''); + iframeHTML.push(''); iframeHTML.push(' '); // 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 // (throbs busy while typing) - outerHTML.push('', '\x3cscript>\n', outerScript.replace(/<\//g, '<\\/'), '\n\x3c/script>', '
x
'); + outerHTML.push('', '\x3cscript>\n', outerScript.replace(/<\//g, '<\\/'), '\n\x3c/script>', '
x
'); var outerFrame = document.createElement("IFRAME"); outerFrame.frameBorder = 0; // for IE diff --git a/static/js/pad_editor.js b/static/js/pad_editor.js index 3dd67544d..23c549146 100644 --- a/static/js/pad_editor.js +++ b/static/js/pad_editor.js @@ -87,8 +87,6 @@ var padeditor = (function() return defaultValue; } - self.ace.setProperty("showsauthorcolors", !settings.noColors); - self.ace.setProperty("rtlIsTrue", settings.rtlIsTrue); var v; @@ -100,6 +98,8 @@ var padeditor = (function() v = getOption('showAuthorColors', true); self.ace.setProperty("showsauthorcolors", v); padutils.setCheckbox($("#options-colorscheck"), v); + // Override from parameters + self.ace.setProperty("showsauthorcolors", !settings.noColors); v = getOption('useMonospaceFont', false); self.ace.setProperty("textface", (v ? "monospace" : "Arial, sans-serif"));