diff options
Diffstat (limited to 'js/ui')
| -rw-r--r-- | js/ui/controls.js | 30 | ||||
| -rw-r--r-- | js/ui/letters.js | 42 | ||||
| -rw-r--r-- | js/ui/palette.js | 74 |
3 files changed, 73 insertions, 73 deletions
diff --git a/js/ui/controls.js b/js/ui/controls.js index c5641c6..c4c7f30 100644 --- a/js/ui/controls.js +++ b/js/ui/controls.js @@ -198,29 +198,29 @@ var controls = (function(){ controls.rotate = new BlurredCheckbox (rotate_checkbox) controls.rotate.use = function(state){ - canvas.rotated = typeof state == "boolean" ? state : ! canvas.rotated - canvas.resize_rapper() - this.update(canvas.rotated) + canvas.rotated = typeof state == "boolean" ? state : ! canvas.rotated + canvas.resize_rapper() + this.update(canvas.rotated) } // controls.vertical = new BlurredCheckbox (vertical_checkbox) controls.vertical.use = function(state){ - canvas.vertical = typeof state == "boolean" ? state : ! canvas.vertical - controls.vertical.refresh() + canvas.vertical = typeof state == "boolean" ? state : ! canvas.vertical + controls.vertical.refresh() } controls.vertical.refresh = function(){ - if (canvas.vertical) { - document.body.classList.add("vertical") - } - else { - document.body.classList.remove("vertical") - } - palette.repaint() - letters.repaint() - this.update(canvas.vertical) - } + if (canvas.vertical) { + document.body.classList.add("vertical") + } + else { + document.body.classList.remove("vertical") + } + palette.repaint() + letters.repaint() + this.update(canvas.vertical) + } // diff --git a/js/ui/letters.js b/js/ui/letters.js index 36d778b..5ed7ffb 100644 --- a/js/ui/letters.js +++ b/js/ui/letters.js @@ -3,10 +3,10 @@ var letters = (function(){ var last_charset = "" var charset_index = 0 var charsets = [ - 'Basic Latin', - 'Latin-1 Supplement', - 'Box Drawing', - 'Block Elements', + 'Basic Latin', + 'Latin-1 Supplement', + 'Box Drawing', + 'Block Elements', ] var letters = new Matrix (1, 1, function(x,y){ @@ -20,30 +20,30 @@ var letters = (function(){ var chars = unicode.block(charset, 32) if (chars[0] != " ") chars.unshift(" ") if (canvas.vertical) { - letters.resize( Math.ceil( chars.length / 16 ), 16 ) + letters.resize( Math.ceil( chars.length / 16 ), 16 ) } else { - letters.resize( 32, Math.ceil( chars.length / 32 ) ) + letters.resize( 32, Math.ceil( chars.length / 32 ) ) } var i = 0 - letters.forEach(function(lex,x,y){ - if (canvas.vertical) { x=x^y;y=x^y;x=x^y } - var char = chars[i++] - if (palette.chars.indexOf(brush.char) > 1) { + letters.forEach(function(lex,x,y){ + if (canvas.vertical) { x=x^y;y=x^y;x=x^y } + var char = chars[i++] + if (palette.chars.indexOf(brush.char) > 1) { lex.bg = brush.fg lex.fg = brush.bg - } - else { + } + else { lex.bg = colors.black lex.fg = brush.fg == fillColor ? colors.black : brush.fg - } + } lex.char = char lex.opacity = 1 - lex.build() - }) - } + lex.build() + }) + } letters.bind = function(){ letters.forEach(function(lex,x,y){ @@ -53,17 +53,17 @@ var letters = (function(){ lex.span.addEventListener('mousedown', function(e){ e.preventDefault() if (e.shiftKey) { - charset_index = (charset_index+1) % charsets.length - letters.repaint(charsets[charset_index]) - return + charset_index = (charset_index+1) % charsets.length + letters.repaint(charsets[charset_index]) + return } else if (e.ctrlKey || e.which == 3) { - brush.char = lex.char + brush.char = lex.char brush.bg = brush.fg brush.fg = fillColor } else { - brush.char = lex.char + brush.char = lex.char if (lex.char == " ") { brush.bg = brush.fg } diff --git a/js/ui/palette.js b/js/ui/palette.js index 7417316..3b5cb24 100644 --- a/js/ui/palette.js +++ b/js/ui/palette.js @@ -11,37 +11,37 @@ var palette = (function(){ palette.chars = " ▓▒░" palette.repaint = function(){ - var xw = use_experimental_palette ? 5 : 2 + var xw = use_experimental_palette ? 5 : 2 if (canvas.vertical) { - palette.resize( xw, 16 ) + palette.resize( xw, 16 ) } else { - palette.resize( 32, xw ) + palette.resize( 32, xw ) } - palette.forEach(function(lex,x,y){ - if (canvas.vertical) { x=x^y;y=x^y;x=x^y;x*=2 } - if (y < 2) { - lex.bg = palette_fn(x>>1) - lex.fg = palette_fn(x>>1) - } - else { - lex.bg = fillColor - lex.fg = palette_fn(x>>1) - } - lex.char = palette.chars[y] - lex.opacity = 1 - lex.build() - if (lex.char == "_") lex.char = " " - }) - } + palette.forEach(function(lex,x,y){ + if (canvas.vertical) { x=x^y;y=x^y;x=x^y;x*=2 } + if (y < 2) { + lex.bg = palette_fn(x>>1) + lex.fg = palette_fn(x>>1) + } + else { + lex.bg = fillColor + lex.fg = palette_fn(x>>1) + } + lex.char = palette.chars[y] + lex.opacity = 1 + lex.build() + if (lex.char == "_") lex.char = " " + }) + } palette.repaint() var use_experimental_palette = false palette.experimental = function(){ - use_experimental_palette = ! use_experimental_palette - use_experimental_palette ? palette.resize(32, 5) : palette.resize(32, 2) - palette.repaint() - return use_experimental_palette + use_experimental_palette = ! use_experimental_palette + use_experimental_palette ? palette.resize(32, 5) : palette.resize(32, 2) + palette.repaint() + return use_experimental_palette } palette.bind = function(){ @@ -60,19 +60,19 @@ var palette = (function(){ } if (e.ctrlKey || e.which == 3) return if (brush.char == " " && lex.char == " ") { - brush.fg = lex.fg - brush.bg = lex.bg - brush.char = lex.char + brush.fg = lex.fg + brush.bg = lex.bg + brush.char = lex.char } else if (lex.char != " ") { - brush.fg = lex.bg - brush.bg = lex.fg - brush.char = lex.char + brush.fg = lex.bg + brush.bg = lex.fg + brush.char = lex.char } else { - brush.fg = lex.bg - brush.bg = fillColor -// brush.char = lex.char + brush.fg = lex.bg + brush.bg = fillColor +// brush.char = lex.char } brush.opacity = lex.opacity if (! brush.modified) { @@ -86,14 +86,14 @@ var palette = (function(){ lex.span.addEventListener('contextmenu', function(e){ e.preventDefault() - fillColor = y ? lex.fg : lex.bg - palette.repaint() + fillColor = y ? lex.fg : lex.bg + palette.repaint() brush.fg = lex.fg brush.char = lex.char brush.opacity = lex.opacity - brush.generate() - brush_rapper.style.borderColor = css_reverse_lookup[fillColor] - return + brush.generate() + brush_rapper.style.borderColor = css_reverse_lookup[fillColor] + return }) }) |
