diff --git a/CHANGELOG.md b/CHANGELOG.md index c25b720df..241cd3070 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor ### v1.11.9 +**v1.11.9.5** *(2015-08-26)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.9.5/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.9.5/builds/4chan-X-noupdate.crx "Chromium version")] +- Fix regression from v1.11.8.0 causing delete link not to work when Cooldown is off. + **v1.11.9.4** *(2015-08-22)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.9.4/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.9.4/builds/4chan-X-noupdate.crx "Chromium version")] - Archive list update: desustorage.org -> archive.horse. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index fcd923118..a6e571129 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 b14da23b1..82513cccc 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.9.4 +// @version 1.11.9.5 // @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 4d6b50029..e467e5a23 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.9.4 +// @version 1.11.9.5 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -412,7 +412,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.9.4', + VERSION: '1.11.9.5', NAMESPACE: '4chan X.', boards: {} }; @@ -9023,6 +9023,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]; @@ -12434,7 +12437,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 3aa0184e5..b60989eab 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 e25404e73..1f66ecb82 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.9.4 +// @version 1.11.9.5 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -412,7 +412,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.9.4', + VERSION: '1.11.9.5', NAMESPACE: '4chan X.', boards: {} }; @@ -9023,6 +9023,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]; @@ -12434,7 +12437,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 759726721..dfdc77745 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 a254e633a..cb43c3935 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.11.9.4 +// @version 1.11.9.5 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 9a42f3b0f..48d413991 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.9.4 +// @version 1.11.9.5 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -412,7 +412,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.9.4', + VERSION: '1.11.9.5', NAMESPACE: '4chan X.', boards: {} }; @@ -9023,6 +9023,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]; @@ -12434,7 +12437,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 e7793a3ac..e3e5e3a63 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 50ced9bc0..ec9c59041 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 3754ecd90..22a41aa17 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 6ed3c5a26..7c1d56de9 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "meta": { "name": "4chan X", "fork": "ccd0", - "version": "1.11.9.4", - "date": "2015-08-22T09:17:38.413Z", + "version": "1.11.9.5", + "date": "2015-08-27T04:07:06.567Z", "page": "https://www.4chan-x.net/", "downloads": "https://www.4chan-x.net/builds/", "oldVersions": "https://raw.githubusercontent.com/ccd0/4chan-x/",