Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Favicon on Catalog

Browse Source
This commit is contained in:
Zixaphir 2014-01-12 19:44:47 -07:00
parent f8035ffded
commit 251eaf802f
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builds/4chan-X.user.js
View File

@ -2281,7 +2281,7 @@
}); });
this.navLinks = $.el('div', { this.navLinks = $.el('div', {
className: 'navLinks', className: 'navLinks',
innerHTML: "<a href=.././ id=returnlink>Return</a> [<a href=./catalog id=cataloglink>Catalog</a>] <a href=\"#bottom\" id=bottomlink>Bottom</a> <time id=\"index-last-refresh\" title=\"Last index refresh\">...</time> <input type=\"search\" id=\"index-search\" class=\"field\" placeholder=\"Search\"><a id=\"index-search-clear\" href=\"javascript:;\" title=\"Clear search\">×</a>" innerHTML: "<a href=.././ id=returnlink>Return</a> [<a href=javascript:; id=cataloglink>Catalog</a>] <a href=\"#bottom\" id=bottomlink>Bottom</a> <time id=\"index-last-refresh\" title=\"Last index refresh\">...</time> <input type=\"search\" id=\"index-search\" class=\"field\" placeholder=\"Search\"><a id=\"index-search-clear\" href=\"javascript:;\" title=\"Clear search\">×</a>"
}); });
this.searchInput = $('#index-search', this.navLinks); this.searchInput = $('#index-search', this.navLinks);
this.currentPage = this.getCurrentPage(); this.currentPage = this.getCurrentPage();
@ -8632,8 +8632,12 @@
Favicon = { Favicon = {
init: function() { init: function() {
return $.asap((function() {
return Favicon.el = $('link[rel="shortcut icon"]', d.head);
}), Favicon.initAsap);
},
initAsap: function() {
var href; var href;
Favicon.el = $('link[rel="shortcut icon"]', d.head);
Favicon.el.type = 'image/x-icon'; Favicon.el.type = 'image/x-icon';
href = Favicon.el.href; href = Favicon.el.href;
Favicon.SFW = /ws\.ico$/.test(href); Favicon.SFW = /ws\.ico$/.test(href);

8
builds/crx/script.js
View File

@ -2291,7 +2291,7 @@
}); });
this.navLinks = $.el('div', { this.navLinks = $.el('div', {
className: 'navLinks', className: 'navLinks',
innerHTML: "<a href=.././ id=returnlink>Return</a> [<a href=./catalog id=cataloglink>Catalog</a>] <a href=\"#bottom\" id=bottomlink>Bottom</a> <time id=\"index-last-refresh\" title=\"Last index refresh\">...</time> <input type=\"search\" id=\"index-search\" class=\"field\" placeholder=\"Search\"><a id=\"index-search-clear\" href=\"javascript:;\" title=\"Clear search\">×</a>" innerHTML: "<a href=.././ id=returnlink>Return</a> [<a href=javascript:; id=cataloglink>Catalog</a>] <a href=\"#bottom\" id=bottomlink>Bottom</a> <time id=\"index-last-refresh\" title=\"Last index refresh\">...</time> <input type=\"search\" id=\"index-search\" class=\"field\" placeholder=\"Search\"><a id=\"index-search-clear\" href=\"javascript:;\" title=\"Clear search\">×</a>"
}); });
this.searchInput = $('#index-search', this.navLinks); this.searchInput = $('#index-search', this.navLinks);
this.currentPage = this.getCurrentPage(); this.currentPage = this.getCurrentPage();
@ -8615,8 +8615,12 @@
Favicon = { Favicon = {
init: function() { init: function() {
return $.asap((function() {
return Favicon.el = $('link[rel="shortcut icon"]', d.head);
}), Favicon.initAsap);
},
initAsap: function() {
var href; var href;
Favicon.el = $('link[rel="shortcut icon"]', d.head);
Favicon.el.type = 'image/x-icon'; Favicon.el.type = 'image/x-icon';
href = Favicon.el.href; href = Favicon.el.href;
Favicon.SFW = /ws\.ico$/.test(href); Favicon.SFW = /ws\.ico$/.test(href);

3
src/General/Index.coffee
View File

@ -84,8 +84,7 @@ Index =
$.on @searchInput, 'input', @onSearchInput $.on @searchInput, 'input', @onSearchInput
$.on $('#index-search-clear', @navLinks), 'click', @clearSearch $.on $('#index-search-clear', @navLinks), 'click', @clearSearch
$.on $('#returnlink', @navLinks), 'click', Navigate.navigate $.on $('#returnlink', @navLinks), 'click', Navigate.navigate
$.on $('#cataloglink', @navLinks), 'click', -> $.on $('#cataloglink', @navLinks), 'click', -> window.location = "//boards.4chan.org/#{g.BOARD}/catalog"
window.location = "//boards.4chan.org/#{g.BOARD}/catalog"
@update() if g.VIEW is 'index' @update() if g.VIEW is 'index'

2
src/General/html/Features/Index-navlinks.html
View File

@ -1,5 +1,5 @@
<a href=.././ id=returnlink>Return</a> <a href=.././ id=returnlink>Return</a>
[<a href=./catalog id=cataloglink>Catalog</a>] [<a href=javascript:; id=cataloglink>Catalog</a>]
<a href="#bottom" id=bottomlink>Bottom</a> <a href="#bottom" id=bottomlink>Bottom</a>
<time id="index-last-refresh" title="Last index refresh">...</time> <time id="index-last-refresh" title="Last index refresh">...</time>
<input type="search" id="index-search" class="field" placeholder="Search"> <input type="search" id="index-search" class="field" placeholder="Search">

4
src/Monitoring/Favicon.coffee
View File

@ -1,6 +1,8 @@
Favicon = Favicon =
init: -> init: ->
Favicon.el = $ 'link[rel="shortcut icon"]', d.head $.asap (-> Favicon.el = $ 'link[rel="shortcut icon"]', d.head), Favicon.initAsap
initAsap: ->
Favicon.el.type = 'image/x-icon' Favicon.el.type = 'image/x-icon'
{href} = Favicon.el {href} = Favicon.el
Favicon.SFW = /ws\.ico$/.test href Favicon.SFW = /ws\.ico$/.test href