diff options
| author | Julie Lala <jules@okfoc.us> | 2015-05-18 18:26:54 +0200 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2015-05-18 18:26:54 +0200 |
| commit | 94ee178000e256dc41438cf4d867e1bced09563e (patch) | |
| tree | b83c789d582b00a5b7eeb6f16a8484290ac5b8e3 /js | |
| parent | b8d2dfbbd1c934a7c09da3a25a4c53ff0c459e92 (diff) | |
fix brush loading + erasing
Diffstat (limited to 'js')
| -rw-r--r-- | js/lex.js | 2 | ||||
| -rw-r--r-- | js/ui/brush.js | 6 | ||||
| -rw-r--r-- | js/ui/canvas.js | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -95,7 +95,7 @@ Lex.prototype.ne = function(lex){ return ! this.eq(lex) } Lex.prototype.clear = function(){ - this.bg = fillColor + this.bg = colors.black this.fg = 0 this.char = " " this.opacity = 0 diff --git a/js/ui/brush.js b/js/ui/brush.js index 53c0e46..4b2db3c 100644 --- a/js/ui/brush.js +++ b/js/ui/brush.js @@ -29,7 +29,7 @@ var brush = (function(){ dragging = true erasing = (e.which == "3" || e.ctrlKey) if (erasing) { - lex.erase() + lex.clear() } else { fillColor = brush.bg @@ -44,7 +44,7 @@ var brush = (function(){ } erasing = (e.which == "3" || e.ctrlKey) if (erasing) { - lex.erase() + lex.clear() } else { lex.fill(brush) @@ -69,7 +69,7 @@ var brush = (function(){ this.expand(-i) } - brush.assign = function(lex){ + brush.load = function(lex){ brush.char = lex.char brush.fg = lex.fg brush.bg = lex.bg diff --git a/js/ui/canvas.js b/js/ui/canvas.js index 75131c1..62bd4c3 100644 --- a/js/ui/canvas.js +++ b/js/ui/canvas.js @@ -29,7 +29,7 @@ var canvas = current_canvas = (function(){ draw.set_last_point(e, point) } else { - brush.assign(lex) + brush.load(lex) brush.generate() dragging = false } |
