fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #434 from jhollinger/unknown_message 

Unknown message
This commit is contained in:
Peter 'Pita' Martischka 2012-02-14 09:21:20 -08:00
parent 8e6b451459 da23a62c49
commit da1fbaad9a
2 changed files with 1 additions and 13 deletions
Show Stats 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);