Merge pull request #587 from sfyn/c55f54b972e42cdaef6cb402d84027bd39ac5774

Fix nocolor embed parameter
pull/589/head
John McLear 2012-04-02 13:50:21 -07:00
commit c7e3656df3
1 changed files with 2 additions and 2 deletions

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"));