diff --git a/LICENSE b/LICENSE index c3a953a51..401cffb14 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.1.3 - 2013-04-28 +* 4chan X - Version 1.1.3 - 2013-04-29 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.js b/builds/4chan-X.js index 935cc190e..ef639957d 100644 --- a/builds/4chan-X.js +++ b/builds/4chan-X.js @@ -18,7 +18,7 @@ // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC // ==/UserScript== /* -* 4chan X - Version 1.1.3 - 2013-04-28 +* 4chan X - Version 1.1.3 - 2013-04-29 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index a58c32940..f28fe4847 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -18,7 +18,7 @@ // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC // ==/UserScript== /* -* 4chan X - Version 1.1.3 - 2013-04-28 +* 4chan X - Version 1.1.3 - 2013-04-29 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE diff --git a/builds/crx/script.js b/builds/crx/script.js index 5905614b9..f3eda3d54 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.1.3 - 2013-04-28 +* 4chan X - Version 1.1.3 - 2013-04-29 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE diff --git a/src/Archive/Redirect.coffee b/src/Archive/Redirect.coffee index b51e8878a..18e6f5fe7 100644 --- a/src/Archive/Redirect.coffee +++ b/src/Archive/Redirect.coffee @@ -17,9 +17,11 @@ Redirect = "//archive.thedarkcave.org/#{boardID}/full_image/#{filename}" when 'hr', 'tv' "http://archive.4plebs.org/#{boardID}/full_image/#{filename}" + when 'c', 'w', 'wg' + "//archive.nyafuu.org/#{boardID}/full_image/#{filename}" when 'ck', 'fa', 'lit', 's4s' "//fuuka.warosu.org/#{boardID}/full_image/#{filename}" - when 'cgl', 'g', 'mu', 'w' + when 'cgl', 'g', 'mu' "//rbt.asia/#{boardID}/full_image/#{filename}" when 'an', 'k', 'toy', 'x' "http://archive.heinessen.com/#{boardID}/full_image/#{filename}" @@ -75,6 +77,10 @@ Redirect = base: 'http://archive.4plebs.org' boards: ['hr', 'tg', 'tv', 'x'] base: 'foolfuuka' + 'NyaFuu': + base: '//archive.nyafuu.org' + boards: ['c', 'w', 'wg'] + type: 'foolfuuka' 'Warosu': base: '//fuuka.warosu.org' boards: ['cgl', 'ck', 'fa', 'jp', 'lit', 's4s', 'q', 'tg'] @@ -95,10 +101,6 @@ Redirect = base: '//www.cliché.net/4chan/cgi-board.pl' boards: ['e'] type: 'fuuka' - 'NyaFuu': - base: '//archive.nyafuu.org' - boards: ['c', 'w'] - type: 'fuuka' path: (base, archiver, data) -> if data.isSearch diff --git a/src/General/Header.coffee b/src/General/Header.coffee index 7cd7f0ce6..253958f07 100644 --- a/src/General/Header.coffee +++ b/src/General/Header.coffee @@ -139,22 +139,22 @@ Header = for a in as if a.textContent is board a = a.cloneNode true - if /-title/.test t - a.textContent = a.title - else if /-replace/.test t - if $.hasClass a, 'current' - a.textContent = a.title + + a.textContent = if /-title/.test(t) or /-replace/.test(t) and $.hasClass a, 'current' + a.title else if /-full/.test t - a.textContent = "/#{board}/ - #{a.title}" - else if /-(index|catalog|text)/.test t - if m = t.match /-(index|catalog)/ - a.setAttribute 'data-only', m[1] - a.href = "//boards.4chan.org/#{board}/" - a.href += 'catalog' if m[1] is 'catalog' - if m = t.match /-text:"(.+)"/ - a.textContent = m[1] - else if board is '@' - $.addClass a, 'navSmall' + "/#{board}/ - #{a.title}" + else if m = t.match /-text:"(.+)"/ + m[1] + else + a.textContent + + if m = t.match /-(index|catalog)/ + a.setAttribute 'data-only', m[1] + a.href = "//boards.4chan.org/#{board}/" + a.href += 'catalog' if m[1] is 'catalog' + + $.addClass a, 'navSmall' if board is '@' return a $.tn t $.add list, nodes diff --git a/src/General/lib/$.coffee b/src/General/lib/$.coffee index f5cccad99..1dfa9940a 100644 --- a/src/General/lib/$.coffee +++ b/src/General/lib/$.coffee @@ -373,7 +373,7 @@ $.set = do -> items = {} localItems = {} catch err - c.error err + c.error err.stack (key, val) -> if typeof key is 'string'