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

Merge da23a62c49 into 8e6b451459

Browse source
This commit is contained in:
GitHub Merge Button 2012-02-13 20:48:30 -08:00
commit 39c144eb00
2 changed files with 1 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
static/js/pad.js
View file

@ -570,16 +570,6 @@ var pad = {
}; };
options.view[key] = value; options.view[key] = value;
pad.handleOptionsChange(options); pad.handleOptionsChange(options);
// if the request isn't to hide line numbers then broadcast this to other users
if (key != "showLineNumbers" && key != "useMonospaceFont")
{
pad.collabClient.sendClientMessage(
{
type: 'padoptions',
options: options,
changedBy: pad.myUserInfo.name || "unnamed"
});
}
}, },
handleOptionsChange: function(opts) handleOptionsChange: function(opts)
{ {

4
static/js/pad_editor.js
View file

@ -75,8 +75,6 @@ var padeditor = (function()
{ {
pad.changeViewOption('useMonospaceFont', $("#viewfontmenu").val() == 'monospace'); pad.changeViewOption('useMonospaceFont', $("#viewfontmenu").val() == 'monospace');
}); });
settings.noColors = !settings.noColors; // Inversed so we can pass it to showauthorcolors
}, },
setViewOptions: function(newOptions) setViewOptions: function(newOptions)
{ {
@ -88,7 +86,7 @@ var padeditor = (function()
return defaultValue; return defaultValue;
} }
self.ace.setProperty("showsauthorcolors", settings.noColors); self.ace.setProperty("showsauthorcolors", !settings.noColors);
self.ace.setProperty("rtlIsTrue", settings.rtlIsTrue); self.ace.setProperty("rtlIsTrue", settings.rtlIsTrue);