This commit is contained in:
Zixaphir 2013-08-04 18:27:21 -07:00
parent 1e9bab7c8b
commit 5721510b1c
3 changed files with 6 additions and 6 deletions

View File

@ -11607,14 +11607,14 @@
matrix: function(foreground, background) { matrix: function(foreground, background) {
var bg, bgHex, fg, fgHex; var bg, bgHex, fg, fgHex;
fgHex = Style.colorToHex(foreground); fgHex = Style.colorToHex(foreground) || "ffffff";
fg = { fg = {
r: parseInt(fgHex.substr(0, 2), 16) / 255, r: parseInt(fgHex.substr(0, 2), 16) / 255,
g: parseInt(fgHex.substr(2, 2), 16) / 255, g: parseInt(fgHex.substr(2, 2), 16) / 255,
b: parseInt(fgHex.substr(4, 2), 16) / 255 b: parseInt(fgHex.substr(4, 2), 16) / 255
}; };
if (background) { if (background) {
bgHex = Style.colorToHex(background); bgHex = Style.colorToHex(background) || "000000";
bg = { bg = {
r: parseInt(bgHex.substr(0, 2), 16) / 255, r: parseInt(bgHex.substr(0, 2), 16) / 255,
g: parseInt(bgHex.substr(2, 2), 16) / 255, g: parseInt(bgHex.substr(2, 2), 16) / 255,

View File

@ -11592,14 +11592,14 @@
matrix: function(foreground, background) { matrix: function(foreground, background) {
var bg, bgHex, fg, fgHex; var bg, bgHex, fg, fgHex;
fgHex = Style.colorToHex(foreground); fgHex = Style.colorToHex(foreground) || "ffffff";
fg = { fg = {
r: parseInt(fgHex.substr(0, 2), 16) / 255, r: parseInt(fgHex.substr(0, 2), 16) / 255,
g: parseInt(fgHex.substr(2, 2), 16) / 255, g: parseInt(fgHex.substr(2, 2), 16) / 255,
b: parseInt(fgHex.substr(4, 2), 16) / 255 b: parseInt(fgHex.substr(4, 2), 16) / 255
}; };
if (background) { if (background) {
bgHex = Style.colorToHex(background); bgHex = Style.colorToHex(background) || "000000";
bg = { bg = {
r: parseInt(bgHex.substr(0, 2), 16) / 255, r: parseInt(bgHex.substr(0, 2), 16) / 255,
g: parseInt(bgHex.substr(2, 2), 16) / 255, g: parseInt(bgHex.substr(2, 2), 16) / 255,

View File

@ -120,7 +120,7 @@ Style =
return return
matrix: (foreground, background) -> matrix: (foreground, background) ->
fgHex = Style.colorToHex foreground fgHex = Style.colorToHex(foreground) or "ffffff"
fg = { fg = {
r: parseInt(fgHex.substr(0, 2), 16) / 255 r: parseInt(fgHex.substr(0, 2), 16) / 255
@ -129,7 +129,7 @@ Style =
} }
if background if background
bgHex = Style.colorToHex background bgHex = Style.colorToHex(background) or "000000"
bg = { bg = {
r: parseInt(bgHex.substr(0, 2), 16) / 255 r: parseInt(bgHex.substr(0, 2), 16) / 255