public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:ether/etherpad-lite into develop

pull/2718/head
John McLear 2015-07-01 20:23:43 +01:00
parent b5686adf92 7520c614ae
commit 193b5a07ef
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/static/js/pad_editor.js
View File

@ -160,23 +160,23 @@ var padeditor = (function()
font = font.replace("use",""); font = font.replace("use","");
font = font.replace("Font",""); font = font.replace("Font","");
font = font.toLowerCase(); font = font.toLowerCase();
if(font === "monospace") self.ace.setProperty("textface", "Courier new"); if(font === "monospace") self.ace.setProperty("textface", "monospace");
if(font === "opendyslexic") self.ace.setProperty("textface", "OpenDyslexic"); if(font === "opendyslexic") self.ace.setProperty("textface", "OpenDyslexic");
if(font === "comicsans") self.ace.setProperty("textface", "Comic Sans MS"); if(font === "comicsans") self.ace.setProperty("textface", "'Comic Sans MS','Comic Sans',cursive");
if(font === "georgia") self.ace.setProperty("textface", "Georgia"); if(font === "georgia") self.ace.setProperty("textface", "Georgia,'Bitstream Charter',serif");
if(font === "impact") self.ace.setProperty("textface", "Impact"); if(font === "impact") self.ace.setProperty("textface", "Impact,Haettenschweiler,'Arial Black',sans-serif");
if(font === "lucida") self.ace.setProperty("textface", "Lucida"); if(font === "lucida") self.ace.setProperty("textface", "Lucida,'Lucida Serif','Lucida Bright',serif");
if(font === "lucidasans") self.ace.setProperty("textface", "Lucida Sans Unicode"); if(font === "lucidasans") self.ace.setProperty("textface", "'Lucida Sans','Lucida Grande','Lucida Sans Unicode','Luxi Sans',sans-serif");
if(font === "palatino") self.ace.setProperty("textface", "Palatino Linotype"); if(font === "palatino") self.ace.setProperty("textface", "Palatino,'Palatino Linotype','URW Palladio L',Georgia,serif");
if(font === "tahoma") self.ace.setProperty("textface", "Tahoma"); if(font === "tahoma") self.ace.setProperty("textface", "Tahoma,sans-serif");
if(font === "timesnewroman") self.ace.setProperty("textface", "Times New Roman"); if(font === "timesnewroman") self.ace.setProperty("textface", "'Times New Roman',Times,serif");
if(font === "trebuchet") self.ace.setProperty("textface", "Trebuchet MS"); if(font === "trebuchet") self.ace.setProperty("textface", "'Trebuchet MS',sans-serif");
if(font === "verdana") self.ace.setProperty("textface", "Verdana"); if(font === "verdana") self.ace.setProperty("textface", "Verdana,'DejaVu Sans',sans-serif");
if(font === "symbol") self.ace.setProperty("textface", "Symbol"); if(font === "symbol") self.ace.setProperty("textface", "Symbol");
if(font === "webdings") self.ace.setProperty("textface", "Webdings"); if(font === "webdings") self.ace.setProperty("textface", "Webdings");
if(font === "wingdings") self.ace.setProperty("textface", "Wingdings"); if(font === "wingdings") self.ace.setProperty("textface", "Wingdings");
if(font === "sansserif") self.ace.setProperty("textface", "MS Sans Serif"); if(font === "sansserif") self.ace.setProperty("textface", "sans-serif");
if(font === "serif") self.ace.setProperty("textface", "MS Serif"); if(font === "serif") self.ace.setProperty("textface", "serif");
// $("#viewfontmenu").val(font); // $("#viewfontmenu").val(font);
normalFont = false; normalFont = false;
@ -185,7 +185,7 @@ var padeditor = (function()
// No font has been previously selected so use the Normal font // No font has been previously selected so use the Normal font
if(normalFont){ if(normalFont){
self.ace.setProperty("textface", "Arial, sans-serif"); self.ace.setProperty("textface", "'Helvetica Neue',Arial, sans-serif");
// $("#viewfontmenu").val("normal"); // $("#viewfontmenu").val("normal");
} }