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

Merge branch 'v3'

Browse Source 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Monitoring/Favicon.coffee
This commit is contained in:
Zixaphir 2014-01-12 19:46:28 -07:00
commit 99a6565ca9
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builds/appchan-x.user.js
View File

@ -4576,7 +4576,7 @@
}); });
this.navLinks = $.el('div', { this.navLinks = $.el('div', {
className: 'navLinks', className: 'navLinks',
innerHTML: "<a href=.././ id=returnlink>Return</a> [<a href=./catalog>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\" class=\"fa\" href=\"javascript:;\">\uf057</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\" class=\"fa\" href=\"javascript:;\">\uf057</a>"
}); });
this.searchInput = $('#index-search', this.navLinks); this.searchInput = $('#index-search', this.navLinks);
this.currentPage = this.getCurrentPage(); this.currentPage = this.getCurrentPage();
@ -17160,7 +17160,7 @@
$.extend(Conf, items); $.extend(Conf, items);
return $.asap((function() { return $.asap((function() {
return Favicon.el = $('link[rel="shortcut icon"]', d.head); return Favicon.el = $('link[rel="shortcut icon"]', d.head);
}), Main.initFeatures); }), Main.initFeatures());
}); });
}, },
initFeatures: function() { initFeatures: function() {

2
builds/crx/script.js
View File

@ -4587,7 +4587,7 @@
}); });
this.navLinks = $.el('div', { this.navLinks = $.el('div', {
className: 'navLinks', className: 'navLinks',
innerHTML: "<a href=.././ id=returnlink>Return</a> [<a href=./catalog>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\" class=\"fa\" href=\"javascript:;\">\uf057</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\" class=\"fa\" href=\"javascript:;\">\uf057</a>"
}); });
this.searchInput = $('#index-search', this.navLinks); this.searchInput = $('#index-search', this.navLinks);
this.currentPage = this.getCurrentPage(); this.currentPage = this.getCurrentPage();

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>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">