diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ee1de086..c791b177f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ ### v1.13.1 +**v1.13.1.4** *(2016-11-09)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.1.4/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.1.4/builds/4chan-X-noupdate.crx)] +- Fix deletion cooldown bug from v1.13.1.0. + **v1.13.1.3** *(2016-11-09)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.1.3/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.1.3/builds/4chan-X-noupdate.crx)] - Merge v1.13.0.24: Fix bug from v1.13.0.0 causing lack of scroll bar when `Fit width` is disabled and images overflow screen. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index c797c1e7b..26a7f68b0 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 9d7c113dc..25129b8c0 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.13.1.3 +// @version 1.13.1.4 // @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 f9476a63c..e58363f74 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.13.1.3 +// @version 1.13.1.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -147,7 +147,7 @@ docSet = function() { }; g = { - VERSION: '1.13.1.3', + VERSION: '1.13.1.4', NAMESPACE: '4chan X.', boards: {} }; @@ -5198,7 +5198,6 @@ Board = (function() { thread: c2.threads || 0, reply: c2.replies || 0, image: c2.images || 0, - deletion: 60, thread_global: 300 }; if (d.cookie.indexOf('pass_enabled=1') >= 0) { @@ -21398,6 +21397,9 @@ QR = (function() { (function() { QR.cooldown = { seconds: 0, + delays: { + deletion: 60 + }, init: function() { if (!Conf['Quick Reply']) { return; @@ -21407,7 +21409,7 @@ QR = (function() { }, setup: function() { var delay, ref, type; - QR.cooldown.delays = g.BOARD.cooldowns(); + $.extend(QR.cooldown.delays, g.BOARD.cooldowns()); QR.cooldown.maxDelay = 0; ref = QR.cooldown.delays; for (type in ref) { diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 8ad8ac040..b947b31a6 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 c9dad18cb..0fa4c3897 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.13.1.3 +// @version 1.13.1.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -147,7 +147,7 @@ docSet = function() { }; g = { - VERSION: '1.13.1.3', + VERSION: '1.13.1.4', NAMESPACE: '4chan X.', boards: {} }; @@ -5198,7 +5198,6 @@ Board = (function() { thread: c2.threads || 0, reply: c2.replies || 0, image: c2.images || 0, - deletion: 60, thread_global: 300 }; if (d.cookie.indexOf('pass_enabled=1') >= 0) { @@ -21398,6 +21397,9 @@ QR = (function() { (function() { QR.cooldown = { seconds: 0, + delays: { + deletion: 60 + }, init: function() { if (!Conf['Quick Reply']) { return; @@ -21407,7 +21409,7 @@ QR = (function() { }, setup: function() { var delay, ref, type; - QR.cooldown.delays = g.BOARD.cooldowns(); + $.extend(QR.cooldown.delays, g.BOARD.cooldowns()); QR.cooldown.maxDelay = 0; ref = QR.cooldown.delays; for (type in ref) { diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index d409ec703..bb59095bf 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 d6eb602b4..7d5d105f3 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.13.1.3 +// @version 1.13.1.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 631371f0d..de8ef1522 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.13.1.3 +// @version 1.13.1.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -147,7 +147,7 @@ docSet = function() { }; g = { - VERSION: '1.13.1.3', + VERSION: '1.13.1.4', NAMESPACE: '4chan X.', boards: {} }; @@ -5198,7 +5198,6 @@ Board = (function() { thread: c2.threads || 0, reply: c2.replies || 0, image: c2.images || 0, - deletion: 60, thread_global: 300 }; if (d.cookie.indexOf('pass_enabled=1') >= 0) { @@ -21398,6 +21397,9 @@ QR = (function() { (function() { QR.cooldown = { seconds: 0, + delays: { + deletion: 60 + }, init: function() { if (!Conf['Quick Reply']) { return; @@ -21407,7 +21409,7 @@ QR = (function() { }, setup: function() { var delay, ref, type; - QR.cooldown.delays = g.BOARD.cooldowns(); + $.extend(QR.cooldown.delays, g.BOARD.cooldowns()); QR.cooldown.maxDelay = 0; ref = QR.cooldown.delays; for (type in ref) { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 128b3299b..d7d8d47da 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 d6b57e25c..9605d68bb 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 8a859bec7..eb2186b43 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index 61870d3e4..0e178da27 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.13.1.3", - "date": "2016-11-09T07:44:42.744Z" + "version": "1.13.1.4", + "date": "2016-11-09T23:17:32.436Z" } \ No newline at end of file