From aa92fb91a4bdc78df23054365ade4dc2af435580 Mon Sep 17 00:00:00 2001
From: Vlad Chernushevich <mailbox@happytodesign.com>
Date: Fri, 28 Jun 2013 15:14:41 +0200
Subject: [PATCH] Change favicon format to .ico. Small improvements to the
 script.

---
 client/assets/img/favicon.ico      | Bin 0 -> 1150 bytes
 client/assets/img/favicon.png      | Bin 1629 -> 0 bytes
 client/assets/src/index.html.tmpl  |   2 +-
 client/assets/src/views/favicon.js |  23 +++++++++++------------
 4 files changed, 12 insertions(+), 13 deletions(-)
 create mode 100644 client/assets/img/favicon.ico
 delete mode 100644 client/assets/img/favicon.png

diff --git a/client/assets/img/favicon.ico b/client/assets/img/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a76262a73d44107053dfdc638a09e899eb307e17
GIT binary patch
literal 1150
zcmbtUT}+c_7=4VIU6@Sb#gg4EdZET-S4+$YID;?+>CZ=?D+TeV71}}}@)Jtwp!1)C
zP=z@P4*J>BQlQXiMM14ZX^W^>Wq?01BV(dos7uTelQGVo;<m(O*^T*f-Y3udednC#
z<jwaIE#oIHj(Giyv@3`{A)*Zo-r}8i`&@|l-I`VJu+;Mc;Dhn@?H@FG?>P+zA8&FE
zMfcmU+_E)Y4*MI1M+bihj{oSmGEp)T`T6q~^S}S&wUT|8$GlI7VcKW%C2u?E2yAX`
zUx@deLE@z|*mkWGsn<oM2Svy)h)}p)3t4q;dydh!x<5Ege=aUAX?;;*Z;e0Sjj!)_
zA^o8TJEAUZA3uw<h!Z=<oRHsiBKNKbhQ~fsO!*;e5r5gFXj!j0;-_<=8IsjhBW0`^
zTOJNzD}O7ExFEaP#atJJyIy46c0&j`ARq07hINiUy?_Ew--|DIw|^Y3Yo`po@wB2c
z7inE}NSf(~5OG5pup>3*9rzwuLv2uwcOjemtWYPkcRV;Y8-U8z?U59_NusyKWmFp8
zWR@u*v6+w(5}}$p2i2$>s(}_{4%s1$okb4MlgAp_Jcs#FKdP?#kzVRrFV&tTnV~*G
zu;?I^<shL*1@%=YT3`Nz=DBg0r-zZjzDmxvhv&%SEPAeoAFxNG=diT!1WC2ctZ`hB
zA1p+2aVBz1#W)qdgtqx8I_D-}o*aZQ(uQ3(98mKd>aYWco(w?e>b<tak7?vLlhklL
zMgE=PO>%WEgepC1eImrUC^}wGL2>ak<X$TZCc3eY`L&PwaKP_-@-JW4NK$<hNsFxO
zB*u#HSLR*VUa<!T+fmen2A~YK;hXcPu%C0NBO=T*Jt!aSd-fjRP)D&|R&bIeWtQ3$
zvvx6|RDq=Oy-07UM1Hgf`pI5s*xxkmMQNb-*Z28W&cGVFn1+pKso$7ptnwyR=Of9u
z8)=Q@(D3;bPy0~)z>C6O@BRPe>l=6u*5XVuT@y)4j%`k@G&vJX)C-B<YM>fyM9q9Z
z)E!>m|MCm#NwSowp5&Z~&v|XK-dMJ!sOWNbhxJvqwI}bx|6iinPl+ra@nx`_vFvYf
Wu`os$vy9&u3yehuER0zOi2edq@N2sO

literal 0
HcmV?d00001

diff --git a/client/assets/img/favicon.png b/client/assets/img/favicon.png
deleted file mode 100644
index 4cbbd8cbe50ba60d5a8fb8ef6c79f239da536d84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1629
zcmaJ>eM}Q)9Ig_eb}*bIQ$)k<#DGY9ZJ`IfQcIzgc2XpzKvfbs+5>L1z0w}`$`Tn2
z6dd>oDmoWHB_fI%6hvx(h?|If`4!Z}F|y5xGcpm4FmzW0+#h3?yL;dFm*4aJzMi}#
z@o_PptmP~QgW;)E$kg<@*!eNt=)d3Cdz4;$NV%3wAks-2YQY#%J&}e1N+X(qsWDV<
z&+ft^7z`JGT%#qms#ruv7&)lZheH|7G@8MPkWgk+mxYl)8kT{Z#Ndn8HW0w|VlY{t
z;;PKiSSGH>wO|RkaT;B2mQJV#CF_6)3ZV&%7>NRu(O|M7lo*`mMd-cL41vJ33z;Pb
zKP079#RJiV1p@?}5VnrX;{h<t;e`rdm=_H2xja6^rC*rM3q=Gl!Vd#x9*~Y^(WfJ7
z+4`AS^hpe6lB5}dAe+s`v4wC5O9sRf3WZJ%KA%l{u&s6ziBfEnb=53`472JixS7NW
z6X0Y-(})~W4APl?D8Xo+qcvG)+C(=DqEIu$<8YlN%{r=7|L<xv&Usr&HTE&z|0K3*
z>}Cv7V^$)^qN4|wzRDTOj6_>7lq4(~f-uZ>F+P(Z32P={2BH&SAW((saFf%pW*VVV
zAxe{#L`^zODHDS<2M5RXNQhh*4u=T@vJjZZ<H`9#fj}UK;c&T>&*z4PM$ckpgf7R3
znaEkJ{v#Hi7wZ&*(M(5{VHSKFreAL%jKFl!2tI!<A@lOhVD<Co5;`vyqLYD~qy5*Y
zXHB$zoZC6!(uX<eV<uYf7FyWcx5qzWFc$VHWl|0G@Wg?xtOV(bpV}H7c6--`qn)AK
z29}?$xp3-I(~rB{vt#<f0)QF=qP)cRvjN0}AGH|zAvbYjK^3K5b6J!9H2wBNSk-vd
z_`9$qkU4zP#bwO*aNiqITTvleTo%0DX1JIGu$bZfoxDYXH7{Om8d$7x2dhS9gUw*p
z()zoiN1{P1x3x6;odmfP-w?Q>`sM0JE4PrRlNAdMeK(Ty?%Ue)9NdYGi~+dNf3%F-
z{MBT0(qZd^dksj_^$TG?dy0ID+8UtYeaG?^9C>ZuP*J6?FRA%0_RM`>|Mjkj=y*8g
z@GZ>N+#fl=1U`k;zFWxj9ADG4^uUO8-?=^9u!8)@E;l>_{<=0*Je=aw73*8vq+q&M
zmrpHNHj&-aSyvQ#EZCmds;b>9ad=I7jdz@1&4MKDbzgHmj(Nuv@ZE;HkoRX(Lb|TE
ze9CXRoFZ?&>hq-c$v|aUq_U{;Ei`m+PwC2-A=jSZeEfOU$Srk)pU6#!G?v6QROGaj
zfBTE~XNCu>hm=dZEBdr4dG6hO^sq<%E7a_LD}Z_MW}jVgt<z902}%r{Xu2{eFjR{N
z+V4(gXs4>%J|9oL^h~nTBS^!H-WtGlO*|v*JtwJ>FKgZ~^g6!-+0lD9HQu-A9Bcof
z$kHot{d09fvH~A>1CvCB#T|CR*j_jNk;aRTeUjvkgD1WlIno>K|L5)<Ni~W$e<;4B
zOy8t;$E4vGvD^XbwXyEy#Iqck;O~)0$J%>!J0e7^^evmacB-ZIhfZqPdy5B)YvE{M
z_wD0#E%yS5-L`SB?S2lk=dahNM1iqw;!P#DN+&BvHr=j%=B-Pu?LWCBH*#73P%8Gt
z(-f*Nxa4TdokKTU_msUGDXP8Ho^ydewWy*ZDz9fNGTgYi&F_9=P<hm-Hh*nakWcrz
r9z(ZE-pW7Qg!fiH-ftkk&tq{Jj!|}$N7bVT&I?~DkCQb-r55}Hv!8i5

diff --git a/client/assets/src/index.html.tmpl b/client/assets/src/index.html.tmpl
index 87d2e2c..81856d3 100644
--- a/client/assets/src/index.html.tmpl
+++ b/client/assets/src/index.html.tmpl
@@ -7,7 +7,7 @@
 
 <title> KiwiIRC </title>
 
-<link rel="shortcut icon" href="<%base_path%>/assets/img/favicon.png">
+<link rel="shortcut icon" href="<%base_path%>/assets/img/favicon.ico">
 
 <link rel="stylesheet" type="text/css" href="<%base_path%>/assets/css/style.css" />
 <link rel="stylesheet" type="text/css" href="<%base_path%>/assets/css/font-awesome.min.css" />
diff --git a/client/assets/src/views/favicon.js b/client/assets/src/views/favicon.js
index f4d5720..bbda5a0 100644
--- a/client/assets/src/views/favicon.js
+++ b/client/assets/src/views/favicon.js
@@ -34,16 +34,12 @@ _kiwi.view.Favicon = Backbone.View.extend({
     _resetHighlights: function () {
         var that = this;
         this.highlight_count = 0;
-        if (this.has_canvas_support) {
-            this._drawFavicon(function(canvas) {
-                that._refreshFavicon(canvas.toDataURL());
-            });
-        }
+        this._refreshFavicon(this.original_favicon);
     },
 
     _drawFavicon: function (callback) {
         var that = this,
-            context = this._createCanvas().getContext('2d'),
+            context = this._getCanvas().getContext('2d'),
             favicon_image = new Image();
 
         // Allow cross origin resource requests
@@ -52,6 +48,7 @@ _kiwi.view.Favicon = Backbone.View.extend({
         favicon_image.src = this.original_favicon;
 
         favicon_image.onload = function() {
+            context.clearRect(0, 0, canvas.width, canvas.height);
             // Draw the favicon itself
             context.drawImage(favicon_image, 0, 0, favicon_image.width, favicon_image.height);
             callback(canvas);
@@ -95,12 +92,14 @@ _kiwi.view.Favicon = Backbone.View.extend({
         $('<link rel="shortcut icon" href="' + url + '">').appendTo($('head'));
     },
 
-    _createCanvas: function () {
-        canvas = document.createElement('canvas');
-        canvas.width = 16;
-        canvas.height = 16;
-
-        return canvas;
+    _getCanvas: function () {
+        if (!this.canvas) {
+            canvas = document.createElement('canvas');
+            canvas.width = 16;
+            canvas.height = 16;
+            this.canvas = canvas;
+        }
+        return this.canvas;
     },
 
     _renderText: function (context, text, x, y, letter_spacing) {
-- 
2.25.1