From 373766e91aef94a86e95d594fc6a20b52bed98ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Wed, 23 Apr 2014 21:43:45 +0200 Subject: [PATCH 01/20] Fix Post.cleanup() breaking EXIF toggling --- src/General/Post.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/General/Post.coffee b/src/General/Post.coffee index ff573a02a..4ec244fc6 100644 --- a/src/General/Post.coffee +++ b/src/General/Post.coffee @@ -153,7 +153,8 @@ class Post for node in $$ '.mobile', root $.rm node for node in $$ '[id]', post - node.removeAttribute 'id' + if node.className isnt 'exif' + node.removeAttribute 'id' for node in $$ '.desktop', root $.rmClass node, 'desktop' return From 20a5b89757110be8eeedcf8f7db7e143e068edba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Wed, 23 Apr 2014 21:58:14 +0200 Subject: [PATCH 02/20] Use an elegant selector instead of a condition --- src/General/Post.coffee | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/General/Post.coffee b/src/General/Post.coffee index 4ec244fc6..3dd604291 100644 --- a/src/General/Post.coffee +++ b/src/General/Post.coffee @@ -152,9 +152,8 @@ class Post cleanup: (root, post) -> for node in $$ '.mobile', root $.rm node - for node in $$ '[id]', post - if node.className isnt 'exif' - node.removeAttribute 'id' + for node in $$ '[id]:not(.exif)', post + node.removeAttribute 'id' for node in $$ '.desktop', root $.rmClass node, 'desktop' return From 7d4586fd99c2acc91a4dca70f86a5194065a0b72 Mon Sep 17 00:00:00 2001 From: fgts Date: Thu, 24 Apr 2014 14:09:41 +0100 Subject: [PATCH 03/20] Update archives.json --- json/archives.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/json/archives.json b/json/archives.json index 21c8357c7..0c5dbb21c 100644 --- a/json/archives.json +++ b/json/archives.json @@ -95,8 +95,8 @@ "http": true, "https": true, "software": "foolfuuka", - "boards": ["cm", "h", "hc", "hm", "r", "s", "soc", "y"], - "files": ["cm", "h", "hc", "hm", "r", "s", "soc", "y"] + "boards": ["asp", "cm", "h", "hc", "hm", "n", "p", "r", "s", "soc", "y"], + "files": ["asp", "cm", "h", "hc", "hm", "n", "p", "r", "s", "soc", "y"] }, { "uid": 16, "name": "maware", From d9bcd963601fa98fc1b77ff7cb9e5686cd8097fe Mon Sep 17 00:00:00 2001 From: NoneGiven Date: Fri, 25 Apr 2014 20:57:26 -0500 Subject: [PATCH 04/20] Pages start at 1 Warn when on the last page, not second-to-last --- src/Monitoring/ThreadStats.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Monitoring/ThreadStats.coffee b/src/Monitoring/ThreadStats.coffee index a477b377b..55b0f25a6 100644 --- a/src/Monitoring/ThreadStats.coffee +++ b/src/Monitoring/ThreadStats.coffee @@ -45,5 +45,5 @@ ThreadStats = for thread in page.threads if thread.no is ThreadStats.thread.ID ThreadStats.pageCountEl.textContent = page.page - (if page.page is @response.length - 1 then $.addClass else $.rmClass) ThreadStats.pageCountEl, 'warning' + (if page.page is @response.length then $.addClass else $.rmClass) ThreadStats.pageCountEl, 'warning' return From a531e834a1666b9bc1c01e1b6262c5a221b10f8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Sat, 26 Apr 2014 21:01:13 +0200 Subject: [PATCH 05/20] Fix handling
s when quoting selection in QR The previous code caused, among others, merging of two-line selections into one line. --- src/Posting/QR.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee index 87edcf3a6..551a3da41 100644 --- a/src/Posting/QR.coffee +++ b/src/Posting/QR.coffee @@ -182,7 +182,7 @@ QR = $.prepend frag, $.tn '[code]' $.add frag, $.tn '[/code]' for node in $$ 'br', frag - $.replace node, $.tn '\n>' unless node is frag.lastElementChild + $.replace node, $.tn '\n>' unless node is frag.lastChild for node in $$ 's', frag $.replace node, [$.tn('[spoiler]'), node.childNodes..., $.tn '[/spoiler]'] for node in $$ '.prettyprint', frag From 442d5886bf51d599a6c6e67105dafe07a0acd8a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Mon, 28 Apr 2014 11:53:43 +0200 Subject: [PATCH 06/20] Fix #1582 --- css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/style.css b/css/style.css index c65b2076c..7b656e274 100644 --- a/css/style.css +++ b/css/style.css @@ -105,7 +105,7 @@ a[href="javascript:;"] { :root.bottom-header body { margin-bottom: 2em; } -body > .desktop:not(#boardNavDesktop):not(#boardNavDesktopFoot), +body > .desktop:not(.navLinks):not(#boardNavDesktop):not(#boardNavDesktopFoot), :root.fourchan-x #navtopright, :root.fourchan-x #navbotright, :root.fourchan-x:not(.show-original-top-board-list) #boardNavDesktop, From 60a668f7dab12ba06f7616ae6433bc78ebf67ef5 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Tue, 29 Apr 2014 14:39:44 +0200 Subject: [PATCH 07/20] Update deps. --- Gruntfile.coffee | 4 ---- package.json | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 64a932158..cc3407f34 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -83,10 +83,6 @@ module.exports = (grunt) -> createTag: false push: false shell: - options: - stdout: true - stderr: true - failOnError: true checkout: command: 'git checkout <%= pkg.meta.mainBranch %>' commit: diff --git a/package.json b/package.json index 602226ba1..b769235f3 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "grunt-contrib-concat": "~0.4.0", "grunt-contrib-copy": "~0.5.0", "grunt-contrib-watch": "~0.6.1", - "grunt-shell": "~0.6.4", + "grunt-shell": "~0.7.0", "load-grunt-tasks": "~0.4.0" }, "repository": { From ad8610b522de1903e0e78fd29f3000d00cea4d6e Mon Sep 17 00:00:00 2001 From: Mayhem Date: Tue, 29 Apr 2014 15:12:42 +0200 Subject: [PATCH 08/20] Pages start at 1 now. --- src/General/Build.coffee | 4 ++-- src/General/Index.coffee | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/General/Build.coffee b/src/General/Build.coffee index f7581daf2..20a03e56b 100644 --- a/src/General/Build.coffee +++ b/src/General/Build.coffee @@ -173,7 +173,7 @@ Build = '' if isOP and g.VIEW is 'index' - pageNum = Index.liveThreadIDs.indexOf(postID) // Index.threadsNumPerPage + pageNum = Index.liveThreadIDs.indexOf(postID) // Index.threadsNumPerPage + 1 pageIcon = " Page #{pageNum}" replyLink = "   [Reply]" else @@ -263,7 +263,7 @@ Build = postCount = data.replies + 1 fileCount = data.images + !!data.ext - pageCount = Index.liveThreadIDs.indexOf(thread.ID) // Index.threadsNumPerPage + pageCount = Index.liveThreadIDs.indexOf(thread.ID) // Index.threadsNumPerPage + 1 subject = if thread.OP.info.subject "
#{thread.OP.info.subject}
" diff --git a/src/General/Index.coffee b/src/General/Index.coffee index 04a3634b3..284b9945c 100644 --- a/src/General/Index.coffee +++ b/src/General/Index.coffee @@ -227,8 +227,8 @@ Index = else 'Show' Index.sort() - if Conf['Index Mode'] is 'paged' and Index.getCurrentPage() > 0 - Index.pageNav 0 + if Conf['Index Mode'] is 'paged' and Index.getCurrentPage() > 1 + Index.pageNav 1 else Index.buildIndex() mode: (e) -> @@ -287,7 +287,7 @@ Index = return e.preventDefault() return if Index.cb.indexNav a, true - Index.userPageNav +a.pathname.split('/')[2] + Index.userPageNav +a.pathname.split('/')[2] or 1 headerNav: (e) -> a = e.target return if e.button isnt 0 or a.nodeName isnt 'A' or a.hostname isnt 'boards.4chan.org' @@ -323,7 +323,7 @@ Index = Header.scrollToIfNeeded Index.navLinks getCurrentPage: -> - +window.location.pathname.split('/')[2] + +window.location.pathname.split('/')[2] or 1 userPageNav: (pageNum) -> if Conf['Refreshed Navigation'] and Conf['Index Mode'] is 'paged' Index.update pageNum @@ -331,7 +331,7 @@ Index = Index.pageNav pageNum pageNav: (pageNum) -> return if Index.currentPage is pageNum - history.pushState null, '', if pageNum is 0 then './' else pageNum + history.pushState null, '', if pageNum is 1 then './' else pageNum Index.pageLoad pageNum pageLoad: (pageNum) -> Index.currentPage = pageNum @@ -347,18 +347,18 @@ Index = getPagesNum: -> Math.ceil Index.sortedThreads.length / Index.getThreadsNumPerPage() getMaxPageNum: -> - Math.max 0, Index.getPagesNum() - 1 + Math.max 1, Index.getPagesNum() togglePagelist: -> Index.pagelist.hidden = Conf['Index Mode'] isnt 'paged' buildPagelist: -> pagesRoot = $ '.pages', Index.pagelist maxPageNum = Index.getMaxPageNum() - if pagesRoot.childElementCount isnt maxPageNum + 1 + if pagesRoot.childElementCount isnt maxPageNum nodes = [] - for i in [0..maxPageNum] by 1 + for i in [1..maxPageNum] by 1 a = $.el 'a', textContent: i - href: if i then i else './' + href: if i is 1 then './' else i nodes.push $.tn('['), a, $.tn '] ' $.rmAll pagesRoot $.add pagesRoot, nodes @@ -370,11 +370,11 @@ Index = # Previous/Next buttons prev = pagesRoot.previousSibling.firstChild next = pagesRoot.nextSibling.firstChild - href = Math.max pageNum - 1, 0 - prev.href = if href is 0 then './' else href + href = Math.max pageNum - 1, 1 + prev.href = if href is 1 then './' else href prev.firstChild.disabled = href is pageNum href = Math.min pageNum + 1, maxPageNum - next.href = if href is 0 then './' else href + next.href = if href is 1 then './' else href next.firstChild.disabled = href is pageNum # current page if strong = $ 'strong', pagesRoot @@ -382,7 +382,7 @@ Index = $.replace strong, strong.firstChild else strong = $.el 'strong' - a = pagesRoot.children[pageNum] + a = pagesRoot.children[pageNum - 1] $.before a, strong $.add strong, a @@ -493,7 +493,7 @@ Index = for threadData, i in Index.liveThreadData threadRoot = Build.thread g.BOARD, threadData if thread = g.BOARD.threads[threadData.no] - thread.setPage i // Index.threadsNumPerPage + thread.setPage i // Index.threadsNumPerPage + 1 thread.setCount 'post', threadData.replies + 1, threadData.bumplimit thread.setCount 'file', threadData.images + !!threadData.ext, threadData.imagelimit thread.setStatus 'Sticky', !!threadData.sticky @@ -600,7 +600,7 @@ Index = Index.pageNav Index.getMaxPageNum() return threadsPerPage = Index.getThreadsNumPerPage() - threads = Index.sortedThreads[threadsPerPage * pageNum ... threadsPerPage * (pageNum + 1)] + threads = Index.sortedThreads[threadsPerPage * (pageNum - 1) ... threadsPerPage * pageNum] nodes = threads.map (thread) -> thread.OP.nodes.root.parentNode Index.buildReplies threads Index.buildHRs nodes @@ -627,7 +627,7 @@ Index = unless Index.searchInput.dataset.searching Index.searchInput.dataset.searching = 1 Index.pageBeforeSearch = Index.getCurrentPage() - pageNum = 0 + pageNum = 1 else pageNum = Index.getCurrentPage() else From 9d4a7441e31b659c4297b5b278cc0ebe98cd738a Mon Sep 17 00:00:00 2001 From: Mayhem Date: Wed, 30 Apr 2014 09:11:38 +0200 Subject: [PATCH 09/20] Fix parsing quotelinks in threads with slugs. Fix #1577 Fix #1580 Fix #1589 Close #1598 --- src/General/Post.coffee | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/General/Post.coffee b/src/General/Post.coffee index 3dd604291..c0d6ffe1f 100644 --- a/src/General/Post.coffee +++ b/src/General/Post.coffee @@ -98,8 +98,9 @@ class Post return unless match = quotelink.href.match /// boards\.4chan\.org/ ([^/]+) # boardID - /thread/\d+#p - (\d+) # postID + /thread/\d+ + .* # thread slug + \#p(\d+) # postID $ /// From 61f57a709163681736482f55724bbc5428a81bf7 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Wed, 30 Apr 2014 09:31:36 +0200 Subject: [PATCH 10/20] Fix #1602 --- src/General/Post.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/General/Post.coffee b/src/General/Post.coffee index c0d6ffe1f..ae0faa502 100644 --- a/src/General/Post.coffee +++ b/src/General/Post.coffee @@ -148,7 +148,7 @@ class Post @file.isImage = /(jpg|png|gif)$/i.test @file.name @file.isVideo = /webm$/i.test @file.name if @file.isImage or @file.isVideo - @file.dimensions = fileText.textContent.match(/\d+x\d+/)[0] + @file.dimensions = fileText.lastChild.data.match(/\d+x\d+/)[0] cleanup: (root, post) -> for node in $$ '.mobile', root From e5035aa4ebc7a715c365543ccc8a11912500262e Mon Sep 17 00:00:00 2001 From: Mayhem Date: Wed, 30 Apr 2014 09:37:23 +0200 Subject: [PATCH 11/20] Changelog. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44e629508..84ee7501e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +- Always more bug fixes. + ### 3.20.9 - *2014-04-20* - Some more bug fixes. From 2de487906ce5d9b3a5f21eb7501ccc5de3d853ca Mon Sep 17 00:00:00 2001 From: Mayhem Date: Wed, 30 Apr 2014 09:37:35 +0200 Subject: [PATCH 12/20] Release 4chan X v3.20.10. --- CHANGELOG.md | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84ee7501e..b07550d8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +### 3.20.10 - *2014-04-30* + - Always more bug fixes. ### 3.20.9 - *2014-04-20* diff --git a/package.json b/package.json index b769235f3..f442d2bfd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "3.20.9", + "version": "3.20.10", "description": "Cross-browser extension for productive lurking on 4chan.", "meta": { "name": "4chan X", From 174e540ee23a0e91c10b5a8ecd0dd4792ebed885 Mon Sep 17 00:00:00 2001 From: Hupotronic Date: Wed, 30 Apr 2014 15:38:07 +0300 Subject: [PATCH 13/20] Use childNodes[2] for finding file resolution ExLinks support vanilla 4chan and can add in its reverse image search link to the .fileText before 4chan X manages to parse it. As a result, 4chan X ends up looking at the reverse image search link for dimensions instead of the correct text element. Using childNodes[2] instead of lastChild fixes this. --- src/General/Post.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/General/Post.coffee b/src/General/Post.coffee index ae0faa502..15a4b71bd 100644 --- a/src/General/Post.coffee +++ b/src/General/Post.coffee @@ -148,7 +148,7 @@ class Post @file.isImage = /(jpg|png|gif)$/i.test @file.name @file.isVideo = /webm$/i.test @file.name if @file.isImage or @file.isVideo - @file.dimensions = fileText.lastChild.data.match(/\d+x\d+/)[0] + @file.dimensions = fileText.childNodes[2].data.match(/\d+x\d+/)[0] cleanup: (root, post) -> for node in $$ '.mobile', root From a9b05047beb71153a786df96c5cc1ce4e736ed97 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Wed, 30 Apr 2014 15:30:46 +0200 Subject: [PATCH 14/20] Build pathnames taking into account the thread slug. --- html/General/Thread-catalog-view.html | 2 +- src/General/Build.coffee | 19 ++++++++++++------- src/General/Main.coffee | 1 + src/Miscellaneous/Keybinds.coffee | 2 +- src/Posting/QR.coffee | 4 ++-- src/Quotelinks/QuoteBacklink.coffee | 2 +- src/Quotelinks/Quotify.coffee | 2 +- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/html/General/Thread-catalog-view.html b/html/General/Thread-catalog-view.html index 1df9afccb..2a18fa150 100644 --- a/html/General/Thread-catalog-view.html +++ b/html/General/Thread-catalog-view.html @@ -1,4 +1,4 @@ - +
#{postCount} / #{fileCount} / #{pageCount} diff --git a/src/General/Build.coffee b/src/General/Build.coffee index 20a03e56b..0e5c3098c 100644 --- a/src/General/Build.coffee +++ b/src/General/Build.coffee @@ -15,6 +15,11 @@ Build = thumbRotate: do -> n = 0 -> n = (n + 1) % 2 + path: (boardID, threadID, postID, fragment) -> + path = "/#{boardID}/thread/#{threadID}" + path += "/#{g.SLUG}" if g.SLUG? and threadID is g.THREADID + path += "##{fragment or 'p'}#{postID}" if postID + path postFromObject: (data, boardID) -> o = # id @@ -175,7 +180,7 @@ Build = if isOP and g.VIEW is 'index' pageNum = Index.liveThreadIDs.indexOf(postID) // Index.threadsNumPerPage + 1 pageIcon = " Page #{pageNum}" - replyLink = "   [Reply]" + replyLink = "   [Reply]" else pageIcon = replyLink = '' @@ -203,12 +208,12 @@ Build = ' ' + "#{date} " + "" + - "No." + + "No." + "#{postID}" + pageIcon + sticky + closed + replyLink + '' + @@ -220,11 +225,11 @@ Build = '
' + # Fix quote pathnames in index or cross-{board,thread} posts for quote in $$ '.quotelink', container href = quote.getAttribute 'href' - continue if href[0] is '/' # Cross-board quote, or board link - href = "#{threadID}#{href}" if href[0] is '#' - quote.href = "/#{boardID}/thread/#{href}" # Fix pathnames + continue unless href[0] is '#' + quote.href = Build.path boardID, threadID, href[2..] container @@ -236,7 +241,7 @@ Build = $.el 'a', className: 'summary' textContent: text.join ' ' - href: "/#{boardID}/thread/#{threadID}" + href: Build.path boardID, threadID thread: (board, data) -> Build.spoilerRange[board] = data.custom_spoiler diff --git a/src/General/Main.coffee b/src/General/Main.coffee index 5b61ccacb..e464f91fb 100644 --- a/src/General/Main.coffee +++ b/src/General/Main.coffee @@ -14,6 +14,7 @@ Main = return if g.VIEW is 'thread' g.THREADID = +pathname[3] + g.SLUG = pathname[4] if pathname[4]? # flatten Config into Conf # and get saved or default values diff --git a/src/Miscellaneous/Keybinds.coffee b/src/Miscellaneous/Keybinds.coffee index 45580ee4d..51a5e1e6b 100644 --- a/src/Miscellaneous/Keybinds.coffee +++ b/src/Miscellaneous/Keybinds.coffee @@ -187,7 +187,7 @@ Keybinds = open: (thread, tab) -> return if g.VIEW isnt 'index' - url = "/#{thread.board}/thread/#{thread}" + url = Build.path thread.board.ID, thread.ID if tab $.open url else diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee index 551a3da41..5d3a9f2ca 100644 --- a/src/Posting/QR.coffee +++ b/src/Posting/QR.coffee @@ -587,9 +587,9 @@ QR = QR.cooldown.set {req, post, isReply, threadID} URL = if threadID is postID # new thread - "/#{g.BOARD}/thread/#{threadID}" + Build.path g.BOARD.ID, threadID else if g.VIEW is 'index' and !QR.cooldown.auto and Conf['Open Post in New Tab'] # replying from the index - "/#{g.BOARD}/thread/#{threadID}#p#{postID}" + Build.path g.BOARD.ID, threadID, postID if URL if Conf['Open Post in New Tab'] $.open URL diff --git a/src/Quotelinks/QuoteBacklink.coffee b/src/Quotelinks/QuoteBacklink.coffee index 03e11b980..d5a4ea67f 100644 --- a/src/Quotelinks/QuoteBacklink.coffee +++ b/src/Quotelinks/QuoteBacklink.coffee @@ -49,7 +49,7 @@ QuoteBacklink = buildBacklink: (quoted, quoter) -> frag = QuoteBacklink.frag.cloneNode true a = frag.lastElementChild - a.href = "/#{quoter.board}/thread/#{quoter.thread}#p#{quoter}" + a.href = Build.path quoter.board.ID, quoter.thread.ID, quoter.ID a.textContent = text = QuoteBacklink.funk quoter.ID if quoter.isDead $.addClass a, 'deadlink' diff --git a/src/Quotelinks/Quotify.coffee b/src/Quotelinks/Quotify.coffee index d3866921e..b6c997d5d 100644 --- a/src/Quotelinks/Quotify.coffee +++ b/src/Quotelinks/Quotify.coffee @@ -40,7 +40,7 @@ Quotify = # Don't add 'deadlink' when quotifying in an archived post, # and we don't know if the post died yet. a = $.el 'a', - href: "/#{boardID}/thread/#{post.thread}#p#{postID}" + href: Build.path boardID, post.thread.ID, postID className: if post.isDead then 'quotelink deadlink' else 'quotelink' textContent: quote $.extend a.dataset, {boardID, threadID: post.thread.ID, postID} From 0c32171b2b7f87d163cf74e347b10804eb20aabd Mon Sep 17 00:00:00 2001 From: Mayhem Date: Wed, 30 Apr 2014 15:37:05 +0200 Subject: [PATCH 15/20] Don't hide hr.desktop in threads. --- css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/style.css b/css/style.css index 7b656e274..feeb2444e 100644 --- a/css/style.css +++ b/css/style.css @@ -105,7 +105,7 @@ a[href="javascript:;"] { :root.bottom-header body { margin-bottom: 2em; } -body > .desktop:not(.navLinks):not(#boardNavDesktop):not(#boardNavDesktopFoot), +body > .desktop:not(hr):not(.navLinks):not(#boardNavDesktop):not(#boardNavDesktopFoot), :root.fourchan-x #navtopright, :root.fourchan-x #navbotright, :root.fourchan-x:not(.show-original-top-board-list) #boardNavDesktop, From b5b86cd32f379a88b0bd8b2a217d8deb3557e9cf Mon Sep 17 00:00:00 2001 From: Mayhem Date: Wed, 30 Apr 2014 15:49:13 +0200 Subject: [PATCH 16/20] Don't mess with the wrong
. --- src/General/Index.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/General/Index.coffee b/src/General/Index.coffee index 284b9945c..f412b7541 100644 --- a/src/General/Index.coffee +++ b/src/General/Index.coffee @@ -107,7 +107,7 @@ Index = for navLink in $$ '.navLinks' $.rm navLink - $.before $.id('delform'), [Index.navLinks, $.x 'child::form/preceding-sibling::hr[1]'] + $.before $.x('child::form[@name="delform"]/preceding-sibling::hr[1]'), Index.navLinks $.asap (-> $('.pagelist') or d.readyState isnt 'loading'), -> $.replace pagelist, Index.pagelist if pagelist = $ '.pagelist' $.rmClass doc, 'index-loading' From 0a1074da8c036f18e62525d262db3fd27a768c27 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Wed, 30 Apr 2014 15:51:49 +0200 Subject: [PATCH 17/20] Changelog. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b07550d8f..8e328317a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +- Minor bug fixes. + ### 3.20.10 - *2014-04-30* - Always more bug fixes. From b63204992df13e3062c74a0768617e1b29b930ff Mon Sep 17 00:00:00 2001 From: Mayhem Date: Wed, 30 Apr 2014 15:51:56 +0200 Subject: [PATCH 18/20] Release 4chan X v3.20.11. --- CHANGELOG.md | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e328317a..0862cb6be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +### 3.20.11 - *2014-04-30* + - Minor bug fixes. ### 3.20.10 - *2014-04-30* diff --git a/package.json b/package.json index f442d2bfd..24584bc20 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "3.20.10", + "version": "3.20.11", "description": "Cross-browser extension for productive lurking on 4chan.", "meta": { "name": "4chan X", From 904b2b6aa07df24016fe145c9d5677fd22b75500 Mon Sep 17 00:00:00 2001 From: Enzo Moretti Date: Fri, 2 May 2014 14:00:02 +0200 Subject: [PATCH 19/20] Removing /v/ from stable Foolz archive --- json/archives.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/json/archives.json b/json/archives.json index 0c5dbb21c..7de6c68d1 100644 --- a/json/archives.json +++ b/json/archives.json @@ -5,7 +5,7 @@ "http": true, "https": true, "software": "foolfuuka", - "boards": ["a", "biz", "co", "diy", "gd", "jp", "m", "sci", "sp", "tg", "tv", "v", "vg", "vp", "vr", "wsg"], + "boards": ["a", "biz", "co", "diy", "gd", "jp", "m", "sci", "sp", "tg", "tv", "vg", "vp", "vr", "wsg"], "files": ["a", "biz", "gd", "diy", "jp", "m", "sci", "tg", "vg", "vp", "vr", "wsg"] }, { "uid": 1, From c13a43e54fa606f9ed7a7f96bc8b4f212d29ef3e Mon Sep 17 00:00:00 2001 From: Enzo Moretti Date: Fri, 2 May 2014 14:11:37 +0200 Subject: [PATCH 20/20] Removing /v/ from beta Foolz, no fallbacks --- json/archives.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/json/archives.json b/json/archives.json index 7de6c68d1..0049b8a9f 100644 --- a/json/archives.json +++ b/json/archives.json @@ -123,6 +123,6 @@ "https": true, "withCredentials": true, "software": "foolfuuka", - "boards": ["a", "biz", "co", "d", "diy", "gd", "jp", "m", "s4s", "sci", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"], + "boards": ["a", "biz", "co", "d", "diy", "gd", "jp", "m", "s4s", "sci", "sp", "tg", "tv", "u", "vg", "vp", "vr", "wsg"], "files": ["a", "biz", "d", "diy", "gd", "jp", "m", "s4s", "sci", "tg", "u", "vg", "vp", "vr", "wsg"] }]