From 76109b7a5f2b5ea4b24fa0c6dfbd3df9d1b07226 Mon Sep 17 00:00:00 2001
From: Julie Lala <jules@okfoc.us>
Date: Fri, 22 May 2015 19:50:30 +0200
Subject: color assignment logik

---
 js/ui/palette.js | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

(limited to 'js/ui/palette.js')

diff --git a/js/ui/palette.js b/js/ui/palette.js
index 063e4aa..1fc17cf 100644
--- a/js/ui/palette.js
+++ b/js/ui/palette.js
@@ -1,13 +1,15 @@
 var palette = (function(){
 
-  var palette_index = localStorage.getItem("ascii.palette") || 1
-  var palette_list = [all_hue, all_inv_hue, mirc_color, mirc_color_reverse]
-  var palette_fn = palette_list[palette_index]
-  var palette_chars = "  ▓▒░"
   var palette = new Matrix (32, 2, function(x,y){
     var lex = new Lex (x,y)
     return lex
   })
+
+  var palette_index = localStorage.getItem("ascii.palette") || 1
+  var palette_list = [all_hue, all_inv_hue, mirc_color, mirc_color_reverse]
+  var palette_fn = palette_list[palette_index]
+  palette.chars = "  ▓▒░"
+
   palette.repaint = function(){
   	palette.forEach(function(lex,x,y){
   		if (y < 2) {
@@ -18,7 +20,7 @@ var palette = (function(){
 				lex.bg = fillColor
 				lex.fg = palette_fn(x>>1)
 			}
-			lex.char = palette_chars[y]
+			lex.char = palette.chars[y]
 			lex.opacity = 1
 			lex.build()
 			if (lex.char == "_") lex.char = " "
@@ -48,9 +50,21 @@ var palette = (function(){
           return
         }
         if (e.ctrlKey || e.which == 3) return
-        brush.fg = lex.fg
-        brush.bg = lex.bg
-        brush.char = lex.char
+        if (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
+        }
+        else {
+					brush.fg = lex.bg
+					brush.bg = fillColor
+// 					brush.char = lex.char
+        }
         brush.opacity = lex.opacity
         if (! brush.modified) {
           brush.generate()
@@ -58,6 +72,7 @@ var palette = (function(){
         if (filling || e.ctrlKey) {
           fillColor = lex.bg
         }
+        letters.repaint()
       })
 
       lex.span.addEventListener('contextmenu', function(e){
-- 
cgit v1.2.3-70-g09d2