From 20846ad4fe90b6025c302d025d9a3e214bf7f41e Mon Sep 17 00:00:00 2001 From: Mayhem Date: Sat, 5 Apr 2014 13:40:54 +0200 Subject: [PATCH 1/8] Fix #1511 --- src/General/Get.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/src/General/Get.coffee b/src/General/Get.coffee index 82eccdabb..116fdc784 100644 --- a/src/General/Get.coffee +++ b/src/General/Get.coffee @@ -100,6 +100,7 @@ Get = $.cache url, -> Get.archivedPost @, boardID, postID, root, context , + responseType: 'json' withCredentials: url.archive.withCredentials else $.addClass root, 'warning' From 9ee39b3908d7e50f2cce629b1615d020127422df Mon Sep 17 00:00:00 2001 From: Mayhem Date: Sat, 5 Apr 2014 13:45:34 +0200 Subject: [PATCH 2/8] Re-setup the QR captcha when necessary. Fix #1534 --- src/Posting/QR.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee index f6e440268..902fe18a5 100644 --- a/src/Posting/QR.coffee +++ b/src/Posting/QR.coffee @@ -546,6 +546,7 @@ QR = QR.cooldown.auto = false QR.status() QR.error err + QR.captcha.setup() if QR.captcha.isEnabled and QR.cooldown.auto return h1 = $ 'h1', resDoc @@ -576,6 +577,7 @@ QR = # Enable auto-posting if we have stuff left to post, disable it otherwise. postsCount = QR.posts.length - 1 QR.cooldown.auto = postsCount and isReply + QR.captcha.setup() if QR.captcha.isEnabled and QR.cooldown.auto unless Conf['Persistent QR'] or QR.cooldown.auto QR.close() From 62321ecb188fb695970eb728c05808312c332731 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Sat, 5 Apr 2014 13:53:52 +0200 Subject: [PATCH 3/8] Fix #1537 --- src/Images/ImageHover.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee index cdf35b575..7e6f82a8d 100644 --- a/src/Images/ImageHover.coffee +++ b/src/Images/ImageHover.coffee @@ -12,7 +12,7 @@ ImageHover = return unless @file and (@file.isImage or @file.isVideo) $.on @file.thumb, 'mouseover', ImageHover.mouseover catalogNode: -> - return unless @thread.OP.file and (@thread.OP.file.isImage @thread.OP.file.isVideo) + return unless @thread.OP.file and (@thread.OP.file.isImage or @thread.OP.file.isVideo) $.on @nodes.thumb, 'mouseover', ImageHover.mouseover mouseover: (e) -> post = if $.hasClass @, 'thumb' From a65c724cfbae512595dfd31158bb91ae30b9e21a Mon Sep 17 00:00:00 2001 From: Mayhem Date: Sat, 5 Apr 2014 14:03:32 +0200 Subject: [PATCH 4/8] Fix #1536 --- src/General/Index.coffee | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/General/Index.coffee b/src/General/Index.coffee index 562ebc2b9..04a3634b3 100644 --- a/src/General/Index.coffee +++ b/src/General/Index.coffee @@ -448,7 +448,10 @@ Index = if req.status is 200 Index.parse req.response, pageNum else if req.status is 304 and pageNum? - Index.pageNav pageNum + if Index.currentPage is pageNum + Index.buildIndex() + else + Index.pageNav pageNum catch err c.error 'Index failure:', err.stack # network error or non-JSON content for example. @@ -473,7 +476,7 @@ Index = Index.parseThreadList pages Index.buildThreads() Index.sort() - if pageNum? + if pageNum? and Index.currentPage isnt pageNum Index.pageNav pageNum return Index.buildIndex() From 12b6fee22213a3ba7955cfe0634254384867eb0d Mon Sep 17 00:00:00 2001 From: Mayhem Date: Sat, 5 Apr 2014 14:07:50 +0200 Subject: [PATCH 5/8] Changelog. --- CHANGELOG.md | 2 ++ src/Posting/QR.coffee | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d48ede46b..25b7cbb34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +- Bug fixes. + ## 3.20.0 - *2014-04-05* - Add support for .webm files. diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee index 902fe18a5..994d5eaa3 100644 --- a/src/Posting/QR.coffee +++ b/src/Posting/QR.coffee @@ -546,7 +546,7 @@ QR = QR.cooldown.auto = false QR.status() QR.error err - QR.captcha.setup() if QR.captcha.isEnabled and QR.cooldown.auto + QR.captcha.setup() if QR.captcha.isEnabled return h1 = $ 'h1', resDoc From bbb92b2dc7f77e7f7804633b328973a691021e39 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Sat, 5 Apr 2014 14:07:57 +0200 Subject: [PATCH 6/8] Release 4chan X v3.20.1. --- CHANGELOG.md | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25b7cbb34..c59804d88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +### 3.20.1 - *2014-04-05* + - Bug fixes. ## 3.20.0 - *2014-04-05* diff --git a/package.json b/package.json index 5e94d7500..b1df8e907 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "3.20.0", + "version": "3.20.1", "description": "Cross-browser extension for productive lurking on 4chan.", "meta": { "name": "4chan X", From 9215c06d558ca4ee16bcd962b8b03e5e9d99e0e6 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Sun, 6 Apr 2014 15:45:19 +0200 Subject: [PATCH 7/8] Fix webm upload. #1533 --- CHANGELOG.md | 2 ++ src/Posting/QR.post.coffee | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c59804d88..9e3ce2d4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +- Fix webm upload. + ### 3.20.1 - *2014-04-05* - Bug fixes. diff --git a/src/Posting/QR.post.coffee b/src/Posting/QR.post.coffee index 8d04f2de1..84826cf94 100644 --- a/src/Posting/QR.post.coffee +++ b/src/Posting/QR.post.coffee @@ -136,7 +136,7 @@ QR.post = class when 'filename' return unless @file @file.newName = @filename.replace /[/\\]/g, '-' - unless /\.(jpe?g|png|gif|pdf|swf)$/i.test @filename + unless /\.(jpe?g|png|gif|pdf|swf|webm)$/i.test @filename # 4chan will truncate the filename if it has no extension, # but it will always replace the extension by the correct one, # so we suffix it with '.jpg' when needed. From 0815e008bbaebb2a36261ba7e204b99309ad0244 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Sun, 6 Apr 2014 15:46:24 +0200 Subject: [PATCH 8/8] Release 4chan X v3.20.2. --- CHANGELOG.md | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e3ce2d4b..c98307544 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +### 3.20.2 - *2014-04-06* + - Fix webm upload. ### 3.20.1 - *2014-04-05* diff --git a/package.json b/package.json index b1df8e907..09921427c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "3.20.1", + "version": "3.20.2", "description": "Cross-browser extension for productive lurking on 4chan.", "meta": { "name": "4chan X",