palette finished + firefox fix

css/piskel.css

@@ -1,36 +0,0 @@
-html, body {
-	height : 100%;
-}
-
-.debug {
-	border : 1px Solid black;
-}
-
-.left-nav {
-	position:absolute;
-	top : 0;
-	bottom : 0;
-	width : 200px;
-	background : #000;
-}
-
-.main-panel {
-	position:absolute;
-	top : 0;
-	bottom : 0;
-	left : 200px;
-	right : 0;
-	background : #ccc;
-}
-
-.preview-container {
-	position : absolute;
-	top : 30px;
-	right : 0;
-	height : 200px;
-	width : 200px;
-	background : white;
-	border : 0px Solid black;
-	border-radius:5px 0px 0px 5px;
-	box-shadow : 0px 0px 2px rgba(0,0,0,0.2);
-}

css/style.css

@@ -127,6 +127,13 @@ ul, li {
   z-index: 1;
 }
 
+#palette li {
+  display : inline-block;
+  height : 20px;
+  width : 20px;
+  margin : 5px;
+}
+
 /* Force apparition of scrollbars on leopard */
 ::-webkit-scrollbar {
     -webkit-appearance: none;

js/frameSheetModel.js

@@ -18,27 +18,15 @@ var FrameSheetModel = (function() {
 			return true; // I'm always right dude
 		},
 
-		getUsedColors : function () {
-			var colors = [];
-			var pixels = this.getAllPixels();
-			for (var i = 0 ; i < pixels.length ; i++) {
-				var pixel = pixels[i];
-				if (pixel && colors.indexOf(pixel)) {
-					colors.push(pixel);
-				}
-			}
-			return colors;
-		},
-
 		getAllPixels : function () {
 			var pixels = [];
 			for (var i = 0 ; i < frames.length ; i++) {
-				pixels = pixels.concat(this.getFramePixels(frames[i]));
+				pixels = pixels.concat(this._getFramePixels(frames[i]));
 			}
 			return pixels;
 		},
 
-		getFramePixels : function (frame) {
+		_getFramePixels : function (frame) {
 			var pixels = [];
 			for (var i = 0 ; i < frame.length ; i++) {
 				var line = frame[i];

js/piskel.js

@@ -4,7 +4,7 @@
       // Constants:
       TRANSPARENT_COLOR = 'tc',
       //TRANSPARENT_COLOR = 'pink',
-      DEFAULT_PEN_COLOR = '#000',
+      DEFAULT_PEN_COLOR = '#000000',
 
       // Configuration:
       // Canvas size in pixel size (not dpi related)
@@ -39,11 +39,11 @@
       frameSheet.addEmptyFrame();
       this.setActiveFrame(0);
 
+      this.initPalette();
       this.initDrawingArea();
       this.initPreviewSlideshow();
       this.initAnimationPreview();
       this.initColorPicker();
-      this.initPalette();
     },
 
     setActiveFrame: function(index) {
@@ -77,19 +77,25 @@
     },
 
     onPickerChange : function(evt) {
-        penColor = "#" + this.colorPicker.value;
+        penColor = this.colorPicker.value;
     },
 
     initPalette : function (color) {
-      var colors = frameSheet.getUsedColors();
+      var pixels = frameSheet.getAllPixels();
-      var paletteEl = $('palette');
+      this.paletteEl = $('palette');
-      paletteEl.innerHTML = "";
+      for (var i = 0 ; i < pixels.length ; i++) {
-      for (var i = 0 ; i < colors.length ; i++) {
+        this.addColorToPalette(pixels[i]);
-        var color = colors[i];
+      }
+    },
+
+    addColorToPalette : function (color) {
+      if (color && color != TRANSPARENT_COLOR && paletteColors.indexOf(color) == -1) {
         var colorEl = document.createElement("li");
         colorEl.setAttribute("data-color", color);
-        colorEl.innerHTML = color;
+        colorEl.setAttribute("title", color);
-        paletteEl.appendChild(colorEl);
+        colorEl.style.background = color;
+        this.paletteEl.appendChild(colorEl);
+        paletteColors.push(color);
       }
     },
 
@@ -323,15 +329,15 @@
       for(var col = 0, num_col = frame.length; col < num_col; col++) {
         for(var row = 0, num_row = frame[col].length; row < num_row; row++) {
           pixelColor = frame[col][row];
-          
           if(pixelColor == undefined || pixelColor == TRANSPARENT_COLOR) {
             context.clearRect(col * dpi, row * dpi, dpi, dpi);   
           } else {
+            if (pixelColor.indexOf("#") != 0) 
+              pixelColor = "#" + pixelColor;
+            this.addColorToPalette(pixelColor);
             context.fillStyle = pixelColor;
             context.fillRect(col * dpi, row * dpi, dpi, dpi);
           }
-         
-          
         }
       }
     },
@@ -345,8 +351,11 @@
 
     onPaletteClick : function (event) {
       var color = event.target.getAttribute("data-color");
+      if (null !== color) {
         var colorPicker = $('color-picker');
         colorPicker.color.fromString(color);
+        this.onPickerChange();
+      }
     },
     
     getRelativeCoordinates : function (x, y) {