Merge branch 'master' of ssh://numinibsd/git/base/enigma-bbs
This commit is contained in:
commit
206d42af66
|
@ -529,7 +529,6 @@ function display(options, cb) {
|
||||||
// ...this should come from sauce, be passed in, or defaulted
|
// ...this should come from sauce, be passed in, or defaulted
|
||||||
var ansiFont = '';
|
var ansiFont = '';
|
||||||
if(options.font) {
|
if(options.font) {
|
||||||
// :TODO: how to set to ignore SAUCE?
|
|
||||||
ansiFont = ansi.setSyncTERMFont(options.font);
|
ansiFont = ansi.setSyncTERMFont(options.font);
|
||||||
} else if(options.sauce) {
|
} else if(options.sauce) {
|
||||||
var fontName = getFontNameFromSAUCE(options.sauce);
|
var fontName = getFontNameFromSAUCE(options.sauce);
|
||||||
|
@ -537,7 +536,8 @@ function display(options, cb) {
|
||||||
fontName = ansi.getSyncTERMFontFromAlias(fontName);
|
fontName = ansi.getSyncTERMFontFromAlias(fontName);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(fontName) {
|
// Don't set default (cp437) from SAUCE
|
||||||
|
if(fontName && 'cp437' !== fontName) {
|
||||||
ansiFont = ansi.setSyncTERMFont(fontName);
|
ansiFont = ansi.setSyncTERMFont(fontName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue