diff --git a/CHANGELOG.md b/CHANGELOG.md index 2adbf9491..6c7675aa7 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### v1.8.8.2 +*2014-07-29* + **ccd0** - Bug fixes. diff --git a/LICENSE b/LICENSE index a0e689465..9c1beb5f6 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.8.8.1 - 2014-07-28 +* 4chan X - Version 1.8.8.2 - 2014-07-29 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 839b96a49..0d5b82cf7 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 9cfa4f89b..2a6cc9cb1 100644 --- a/builds/4chan-X-beta.meta.js +++ b/builds/4chan-X-beta.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.8.8.1 +// @version 1.8.8.2 // @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 f7935b8b8..94fb4f3c3 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 -// @version 1.8.8.1 +// @version 1.8.8.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.8.8.1 - 2014-07-28 +* 4chan X - Version 1.8.8.2 - 2014-07-29 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -378,7 +378,7 @@ doc = d.documentElement; g = { - VERSION: '1.8.8.1', + VERSION: '1.8.8.2', NAMESPACE: '4chan X.', boards: {} }; @@ -7995,8 +7995,11 @@ }, error: function(file, post, delay, cb) { var kill, timeoutID; - if ((post.isDead || post.file.isDead) && file.src.split('/')[2] === 'i.4cdn.org') { - ImageCommon.retry(post, cb); + if (file.src.split('/')[2] !== 'i.4cdn.org') { + return cb(null); + } + if (post.isDead || post.file.isDead) { + return ImageCommon.retry(post, cb); } if (delay != null) { timeoutID = setTimeout(ImageCommon.retry, delay, post, cb); @@ -11254,7 +11257,7 @@ return; } roll = $('b', this.nodes.comment).firstChild; - return roll.data = "Rolled " + dicestats[1] + "d" + dicestats[2] + ": " + (roll.data.slice(7)); + return roll.data = "Rolled " + (roll.data.split(',').length) + "d" + dicestats[2] + ": " + (roll.data.slice(7)); } }; @@ -12579,7 +12582,7 @@ Settings.dialog = dialog = $.el('div', { id: 'fourchanx-settings', className: 'dialog', - innerHTML: '
' + innerHTML: '
' }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); @@ -13421,7 +13424,7 @@ } if (previousversion) { el = $.el('span', { - innerHTML: '4chan X has been updated to version 1.8.8.1.' + innerHTML: '4chan X has been updated to version 1.8.8.2.' }); new Notice('info', el, 15); } else { diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 401304f35..e89e55241 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 75bee2d76..188dc54ee 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.8.8.1 +// @version 1.8.8.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -23,7 +23,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.8.8.1 - 2014-07-28 +* 4chan X - Version 1.8.8.2 - 2014-07-29 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -377,7 +377,7 @@ doc = d.documentElement; g = { - VERSION: '1.8.8.1', + VERSION: '1.8.8.2', NAMESPACE: '4chan X.', boards: {} }; @@ -7994,8 +7994,11 @@ }, error: function(file, post, delay, cb) { var kill, timeoutID; - if ((post.isDead || post.file.isDead) && file.src.split('/')[2] === 'i.4cdn.org') { - ImageCommon.retry(post, cb); + if (file.src.split('/')[2] !== 'i.4cdn.org') { + return cb(null); + } + if (post.isDead || post.file.isDead) { + return ImageCommon.retry(post, cb); } if (delay != null) { timeoutID = setTimeout(ImageCommon.retry, delay, post, cb); @@ -11253,7 +11256,7 @@ return; } roll = $('b', this.nodes.comment).firstChild; - return roll.data = "Rolled " + dicestats[1] + "d" + dicestats[2] + ": " + (roll.data.slice(7)); + return roll.data = "Rolled " + (roll.data.split(',').length) + "d" + dicestats[2] + ": " + (roll.data.slice(7)); } }; @@ -12578,7 +12581,7 @@ Settings.dialog = dialog = $.el('div', { id: 'fourchanx-settings', className: 'dialog', - innerHTML: '
' + innerHTML: '
' }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); @@ -13420,7 +13423,7 @@ } if (previousversion) { el = $.el('span', { - innerHTML: '4chan X has been updated to version 1.8.8.1.' + innerHTML: '4chan X has been updated to version 1.8.8.2.' }); new Notice('info', el, 15); } else { diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index f9dfff425..361f87aac 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 71585655c..34709b897 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.8.8.1 +// @version 1.8.8.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index d7a89daf4..d83e1c84b 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.8.8.1 +// @version 1.8.8.2 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.8.8.1 - 2014-07-28 +* 4chan X - Version 1.8.8.2 - 2014-07-29 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -378,7 +378,7 @@ doc = d.documentElement; g = { - VERSION: '1.8.8.1', + VERSION: '1.8.8.2', NAMESPACE: '4chan X.', boards: {} }; @@ -7995,8 +7995,11 @@ }, error: function(file, post, delay, cb) { var kill, timeoutID; - if ((post.isDead || post.file.isDead) && file.src.split('/')[2] === 'i.4cdn.org') { - ImageCommon.retry(post, cb); + if (file.src.split('/')[2] !== 'i.4cdn.org') { + return cb(null); + } + if (post.isDead || post.file.isDead) { + return ImageCommon.retry(post, cb); } if (delay != null) { timeoutID = setTimeout(ImageCommon.retry, delay, post, cb); @@ -11254,7 +11257,7 @@ return; } roll = $('b', this.nodes.comment).firstChild; - return roll.data = "Rolled " + dicestats[1] + "d" + dicestats[2] + ": " + (roll.data.slice(7)); + return roll.data = "Rolled " + (roll.data.split(',').length) + "d" + dicestats[2] + ": " + (roll.data.slice(7)); } }; @@ -12579,7 +12582,7 @@ Settings.dialog = dialog = $.el('div', { id: 'fourchanx-settings', className: 'dialog', - innerHTML: '
' + innerHTML: '
' }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); @@ -13421,7 +13424,7 @@ } if (previousversion) { el = $.el('span', { - innerHTML: '4chan X has been updated to version 1.8.8.1.' + innerHTML: '4chan X has been updated to version 1.8.8.2.' }); new Notice('info', el, 15); } else { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index b8807b75d..db680cdcd 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 0c8109998..279036e0f 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 f14de1330..6abf50107 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index c91cfd1b5..b0dd170b3 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "1.8.8.1", + "version": "1.8.8.2", "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X",