diff --git a/CHANGELOG.md b/CHANGELOG.md index 935f13f55..612daaa20 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor ### v1.11.10 +**v1.11.10.3** *(2015-08-26)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.10.3/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.10.3/builds/4chan-X-noupdate.crx "Chromium version")] +- Merge v1.11.9.5: Fix regression from v1.11.8.0 causing delete link not to work when Cooldown is off. + **v1.11.10.2** *(2015-08-25)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.10.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.10.2/builds/4chan-X-noupdate.crx "Chromium version")] - Disable Alt+Number and Alt+Arrow keybinds in text fields to fix conflict with Alt+NumPad character input. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index c6c4cadaf..7840ed7c7 100644 Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js index fffe3c81c..19d53f37d 100644 --- a/builds/4chan-X-beta.meta.js +++ b/builds/4chan-X-beta.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.11.10.2 +// @version 1.11.10.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js index 044a476c0..bfcb1c6ef 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X beta -// @version 1.11.10.2 +// @version 1.11.10.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -412,7 +412,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.10.2', + VERSION: '1.11.10.3', NAMESPACE: '4chan X.', boards: {} }; @@ -9064,6 +9064,9 @@ }, secondsDeletion: function(post) { var cooldown, cooldowns, seconds, start; + if (!(Conf['Quick Reply'] && Conf['Cooldown'])) { + return 0; + } cooldowns = QR.cooldown.data[post.board.ID] || {}; for (start in cooldowns) { cooldown = cooldowns[start]; @@ -12475,7 +12478,7 @@ if (post.fullID === DeleteLink.post.fullID) { $.on(link, 'click', DeleteLink.toggle); } - if (/\bwait\b/i.test(msg.textContent)) { + if (Conf['Quick Reply'] && Conf['Cooldown'] && /\bwait\b/i.test(msg.textContent)) { DeleteLink.cooldown.start(post, 5); DeleteLink.auto[+fileOnly][post.fullID] = true; return DeleteLink.nodes.links[+fileOnly].textContent = DeleteLink.linkText(fileOnly); diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 79d34a71d..e45833459 100644 Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js index bc180f566..f80d2a9e0 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.11.10.2 +// @version 1.11.10.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -412,7 +412,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.10.2', + VERSION: '1.11.10.3', NAMESPACE: '4chan X.', boards: {} }; @@ -9064,6 +9064,9 @@ }, secondsDeletion: function(post) { var cooldown, cooldowns, seconds, start; + if (!(Conf['Quick Reply'] && Conf['Cooldown'])) { + return 0; + } cooldowns = QR.cooldown.data[post.board.ID] || {}; for (start in cooldowns) { cooldown = cooldowns[start]; @@ -12475,7 +12478,7 @@ if (post.fullID === DeleteLink.post.fullID) { $.on(link, 'click', DeleteLink.toggle); } - if (/\bwait\b/i.test(msg.textContent)) { + if (Conf['Quick Reply'] && Conf['Cooldown'] && /\bwait\b/i.test(msg.textContent)) { DeleteLink.cooldown.start(post, 5); DeleteLink.auto[+fileOnly][post.fullID] = true; return DeleteLink.nodes.links[+fileOnly].textContent = DeleteLink.linkText(fileOnly); diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index eb80b3e3f..a236a33b5 100644 Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index 6f71d4e78..cac2d47d2 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.11.10.2 +// @version 1.11.10.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 8822739e8..d94d3f686 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.11.10.2 +// @version 1.11.10.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -412,7 +412,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.10.2', + VERSION: '1.11.10.3', NAMESPACE: '4chan X.', boards: {} }; @@ -9064,6 +9064,9 @@ }, secondsDeletion: function(post) { var cooldown, cooldowns, seconds, start; + if (!(Conf['Quick Reply'] && Conf['Cooldown'])) { + return 0; + } cooldowns = QR.cooldown.data[post.board.ID] || {}; for (start in cooldowns) { cooldown = cooldowns[start]; @@ -12475,7 +12478,7 @@ if (post.fullID === DeleteLink.post.fullID) { $.on(link, 'click', DeleteLink.toggle); } - if (/\bwait\b/i.test(msg.textContent)) { + if (Conf['Quick Reply'] && Conf['Cooldown'] && /\bwait\b/i.test(msg.textContent)) { DeleteLink.cooldown.start(post, 5); DeleteLink.auto[+fileOnly][post.fullID] = true; return DeleteLink.nodes.links[+fileOnly].textContent = DeleteLink.linkText(fileOnly); diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index eea916902..59571578c 100644 Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml index b5c4b1045..5610b9a1a 100644 --- a/builds/updates-beta.xml +++ b/builds/updates-beta.xml @@ -1,7 +1,7 @@ - + diff --git a/builds/updates.xml b/builds/updates.xml index 7d18a77e5..54f6907c4 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 62edf3bb6..23880122f 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "meta": { "name": "4chan X", "fork": "ccd0", - "version": "1.11.10.2", - "date": "2015-08-25T22:35:56.707Z", + "version": "1.11.10.3", + "date": "2015-08-27T04:09:42.498Z", "page": "https://www.4chan-x.net/", "downloads": "https://www.4chan-x.net/builds/", "oldVersions": "https://raw.githubusercontent.com/ccd0/4chan-x/",