From 941cd4bfe9579dadfcea0a6055618fa3b582b1e9 Mon Sep 17 00:00:00 2001 From: James Campos Date: Sun, 11 Sep 2011 11:11:21 -0700 Subject: [PATCH] favicon refactoring --- 4chan_x.user.js | 9 ++++++--- script.coffee | 8 +++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index a4723998e..fc0ea6de3 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2529,8 +2529,12 @@ }; Favicon = { init: function() { - Favicon["default"] = $('link[rel="shortcut icon"]', d.head).href; - return Favicon.halo = /ws/.test(Favicon["default"]) ? Favicon.haloSFW : Favicon.haloNSFW; + var favicon, href; + favicon = $('link[rel="shortcut icon"]', d.head); + favicon.type = 'image/x-icon'; + href = favicon.href; + Favicon["default"] = href; + return Favicon.halo = /ws/.test(href) ? Favicon.haloSFW : Favicon.haloNSFW; }, dead: 'data:image/gif;base64,R0lGODlhEAAQAKECAAAAAP8AAP///////yH5BAEKAAIALAAAAAAQABAAAAIvlI+pq+D9DAgUoFkPDlbs7lFZKIJOJJ3MyraoB14jFpOcVMpzrnF3OKlZYsMWowAAOw==', deadHalo: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAANhJREFUOMutU0EKwjAQzEPFgyBFei209gOKINh6tL3qO3yAB9OHWPTeMZsmJaRpiNjAkE1mMt1stgwA+wdsFgM1oHE4FXmSpWUcRzWBYtozNfKAYdCHCrQuosX9tlk+CBS7NKMMbMF7vXoJtC7Om8HwhXzbCWCSn6qBJHd74FIBVS1jm7czYFSsq7gvpY0s6+ThJwc4743EHnGkIW2YAW+AphkMPj6DJE1LXW3fFUhD2pHBsTznLKCIFCstC3nGNvQZnQa6kX4yMGfdyi7OZaB7wZy93Cx/4xfgv/s+XYFMrAAAAABJRU5ErkJggg%3D%3D', @@ -2847,7 +2851,6 @@ return; } Favicon.init(); - $('link[rel="shortcut icon"]', d.head).type = 'image/x-icon'; g.hiddenReplies = $.get("hiddenReplies/" + g.BOARD + "/", {}); tzOffset = (new Date()).getTimezoneOffset() / 60; g.chanOffset = 5 - tzOffset; diff --git a/script.coffee b/script.coffee index 7308686e8..7ac64d6fc 100644 --- a/script.coffee +++ b/script.coffee @@ -1923,8 +1923,11 @@ unread = Favicon = init: -> - Favicon.default = $('link[rel="shortcut icon"]', d.head).href - Favicon.halo = if /ws/.test Favicon.default then Favicon.haloSFW else Favicon.haloNSFW + favicon = $ 'link[rel="shortcut icon"]', d.head + favicon.type = 'image/x-icon' + {href} = favicon + Favicon.default = href + Favicon.halo = if /ws/.test href then Favicon.haloSFW else Favicon.haloNSFW dead: 'data:image/gif;base64,R0lGODlhEAAQAKECAAAAAP8AAP///////yH5BAEKAAIALAAAAAAQABAAAAIvlI+pq+D9DAgUoFkPDlbs7lFZKIJOJJ3MyraoB14jFpOcVMpzrnF3OKlZYsMWowAAOw==' deadHalo: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAANhJREFUOMutU0EKwjAQzEPFgyBFei209gOKINh6tL3qO3yAB9OHWPTeMZsmJaRpiNjAkE1mMt1stgwA+wdsFgM1oHE4FXmSpWUcRzWBYtozNfKAYdCHCrQuosX9tlk+CBS7NKMMbMF7vXoJtC7Om8HwhXzbCWCSn6qBJHd74FIBVS1jm7czYFSsq7gvpY0s6+ThJwc4743EHnGkIW2YAW+AphkMPj6DJE1LXW3fFUhD2pHBsTznLKCIFCstC3nGNvQZnQa6kX4yMGfdyi7OZaB7wZy93Cx/4xfgv/s+XYFMrAAAAABJRU5ErkJggg%3D%3D' empty: 'data:image/gif;base64,R0lGODlhEAAQAJEAAAAAAP///9vb2////yH5BAEAAAMALAAAAAAQABAAAAIvnI+pq+D9DBAUoFkPFnbs7lFZKIJOJJ3MyraoB14jFpOcVMpzrnF3OKlZYsMWowAAOw==' @@ -2197,7 +2200,6 @@ main = return Favicon.init() - $('link[rel="shortcut icon"]', d.head).type = 'image/x-icon' g.hiddenReplies = $.get "hiddenReplies/#{g.BOARD}/", {} tzOffset = (new Date()).getTimezoneOffset() / 60 # GMT -8 is given as +480; would GMT +8 be -480 ?