diff --git a/CHANGELOG.md b/CHANGELOG.md index a2a0f1539..0304afae5 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### v1.8.3 +*2014-07-01* + **ccd0** - Fix `Reveal Spoiler Thumbnails` on archived posts. diff --git a/LICENSE b/LICENSE index 284510fe7..9c7864901 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.8.2 - 2014-06-30 +* 4chan X - Version 1.8.3 - 2014-07-01 * * 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 ada1c37c8..fb7f449b6 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 16caab8f3..a1691631f 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.2 +// @version 1.8.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 686344371..483ef1ac1 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.2 +// @version 1.8.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.8.2 - 2014-06-30 +* 4chan X - Version 1.8.3 - 2014-07-01 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -375,7 +375,7 @@ doc = d.documentElement; g = { - VERSION: '1.8.2', + VERSION: '1.8.3', NAMESPACE: '4chan X.', boards: {} }; @@ -1108,7 +1108,7 @@ size *= 1024; } this.file.sizeInBytes = size; - this.file.thumbURL = that.isArchived ? thumb.src : "" + location.protocol + "//t.4cdn.org/" + this.board + "/" + (this.file.URL.match(/(\d+)\./)[1]) + "s.jpg"; + this.file.thumbURL = "" + location.protocol + "//t.4cdn.org/" + this.board + "/" + (this.file.URL.match(/(\d+)\./)[1]) + "s.jpg"; this.file.isImage = /(jpg|png|gif)$/i.test(this.file.URL); this.file.isVideo = /webm$/i.test(this.file.URL); nameNode = $('a', fileText); @@ -3578,6 +3578,7 @@ post = new Post(Build.post(o), thread, board, { isArchived: true }); + post.file.thumbURL = o.file.turl; post.isFetchedQuote = true; Main.callbackNodes(Post, [post]); return Get.insert(post, root, context); @@ -11421,84 +11422,81 @@ return FileInfo.format(Conf['fileInfo'], this, this.file.text.firstElementChild); }, format: function(formatString, post, outputNode) { - var output; - output = { - innerHTML: '' - }; + FileInfo.innerHTML = ''; formatString.replace(/%(.)|[^%]+/g, function(s, c) { if (c in FileInfo.formatters) { - FileInfo.formatters[c].call(post, output); + FileInfo.formatters[c].call(post); } else { - output.innerHTML += E(s); + FileInfo.innerHTML += E(s); } return ''; }); - return outputNode.innerHTML = output.innerHTML; + return outputNode.innerHTML = FileInfo.innerHTML; }, formatters: { - t: function(x) { + t: function() { var timestamp; timestamp = this.file.URL.match(/\d+\..+$/)[0]; - return x.innerHTML += E(timestamp); + return FileInfo.innerHTML += E(timestamp); }, - T: function(x) { - x.innerHTML += ""; - FileInfo.formatters.t.call(this, x); - return x.innerHTML += ''; + T: function() { + FileInfo.innerHTML += ""; + FileInfo.formatters.t.call(this); + return FileInfo.innerHTML += ''; }, - l: function(x) { - x.innerHTML += ""; - FileInfo.formatters.n.call(this, x); - return x.innerHTML += ''; + l: function() { + FileInfo.innerHTML += ""; + FileInfo.formatters.n.call(this); + return FileInfo.innerHTML += ''; }, - L: function(x) { - x.innerHTML += ""; - FileInfo.formatters.N.call(this, x); - return x.innerHTML += ''; + L: function() { + FileInfo.innerHTML += ""; + FileInfo.formatters.N.call(this); + return FileInfo.innerHTML += ''; }, - n: function(x) { + n: function() { var fullname, shortname; fullname = this.file.name; shortname = Build.shortFilename(this.file.name, this.isReply); if (fullname === shortname) { - return x.innerHTML += E(fullname); + return FileInfo.innerHTML += E(fullname); } else { - return x.innerHTML += "" + (E(shortname)) + "" + (E(fullname)) + ""; + return FileInfo.innerHTML += "" + (E(shortname)) + "" + (E(fullname)) + ""; } }, - N: function(x) { - return x.innerHTML += E(this.file.name); + N: function() { + return FileInfo.innerHTML += E(this.file.name); }, - p: function(x) { + p: function() { if (this.file.isSpoiler) { - return x.innerHTML += 'Spoiler, '; + return FileInfo.innerHTML += 'Spoiler, '; } }, - s: function(x) { - return x.innerHTML += E(this.file.size); + s: function() { + return FileInfo.innerHTML += E(this.file.size); }, - B: function(x) { + B: function() { var sizeB; sizeB = Math.round(this.file.sizeInBytes); - return x.innerHTML += "" + (+sizeB) + " Bytes"; + return FileInfo.innerHTML += "" + (+sizeB) + " Bytes"; }, - K: function(x) { + K: function() { var sizeKB; sizeKB = Math.round(this.file.sizeInBytes / 1024); - return x.innerHTML += "" + (+sizeKB) + " KB"; + return FileInfo.innerHTML += "" + (+sizeKB) + " KB"; }, - M: function(x) { + M: function() { var sizeMB; sizeMB = Math.round(this.file.sizeInBytes / 1048576 * 100) / 100; - return x.innerHTML += "" + (+sizeMB) + " MB"; + return FileInfo.innerHTML += "" + (+sizeMB) + " MB"; }, - r: function(x) { + r: function() { var dim; dim = this.file.dimensions || 'PDF'; - return x.innerHTML += E(dim); + return FileInfo.innerHTML += E(dim); }, - '%': function(x) { - return x.innerHTML += '%'; + '%': function() { + return FileInfo.innerHTML += '%'; } } }; @@ -12403,7 +12401,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"]); @@ -13255,7 +13253,7 @@ } if (previousversion) { el = $.el('span', { - innerHTML: '4chan X has been updated to version 1.8.2.' + innerHTML: '4chan X has been updated to version 1.8.3.' }); new Notice('info', el, 15); } else { diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 340d62a82..925848d3a 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 3ae013a14..43c902060 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.2 +// @version 1.8.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -23,7 +23,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.8.2 - 2014-06-30 +* 4chan X - Version 1.8.3 - 2014-07-01 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -374,7 +374,7 @@ doc = d.documentElement; g = { - VERSION: '1.8.2', + VERSION: '1.8.3', NAMESPACE: '4chan X.', boards: {} }; @@ -1107,7 +1107,7 @@ size *= 1024; } this.file.sizeInBytes = size; - this.file.thumbURL = that.isArchived ? thumb.src : "" + location.protocol + "//t.4cdn.org/" + this.board + "/" + (this.file.URL.match(/(\d+)\./)[1]) + "s.jpg"; + this.file.thumbURL = "" + location.protocol + "//t.4cdn.org/" + this.board + "/" + (this.file.URL.match(/(\d+)\./)[1]) + "s.jpg"; this.file.isImage = /(jpg|png|gif)$/i.test(this.file.URL); this.file.isVideo = /webm$/i.test(this.file.URL); nameNode = $('a', fileText); @@ -3577,6 +3577,7 @@ post = new Post(Build.post(o), thread, board, { isArchived: true }); + post.file.thumbURL = o.file.turl; post.isFetchedQuote = true; Main.callbackNodes(Post, [post]); return Get.insert(post, root, context); @@ -11420,84 +11421,81 @@ return FileInfo.format(Conf['fileInfo'], this, this.file.text.firstElementChild); }, format: function(formatString, post, outputNode) { - var output; - output = { - innerHTML: '' - }; + FileInfo.innerHTML = ''; formatString.replace(/%(.)|[^%]+/g, function(s, c) { if (c in FileInfo.formatters) { - FileInfo.formatters[c].call(post, output); + FileInfo.formatters[c].call(post); } else { - output.innerHTML += E(s); + FileInfo.innerHTML += E(s); } return ''; }); - return outputNode.innerHTML = output.innerHTML; + return outputNode.innerHTML = FileInfo.innerHTML; }, formatters: { - t: function(x) { + t: function() { var timestamp; timestamp = this.file.URL.match(/\d+\..+$/)[0]; - return x.innerHTML += E(timestamp); + return FileInfo.innerHTML += E(timestamp); }, - T: function(x) { - x.innerHTML += ""; - FileInfo.formatters.t.call(this, x); - return x.innerHTML += ''; + T: function() { + FileInfo.innerHTML += ""; + FileInfo.formatters.t.call(this); + return FileInfo.innerHTML += ''; }, - l: function(x) { - x.innerHTML += ""; - FileInfo.formatters.n.call(this, x); - return x.innerHTML += ''; + l: function() { + FileInfo.innerHTML += ""; + FileInfo.formatters.n.call(this); + return FileInfo.innerHTML += ''; }, - L: function(x) { - x.innerHTML += ""; - FileInfo.formatters.N.call(this, x); - return x.innerHTML += ''; + L: function() { + FileInfo.innerHTML += ""; + FileInfo.formatters.N.call(this); + return FileInfo.innerHTML += ''; }, - n: function(x) { + n: function() { var fullname, shortname; fullname = this.file.name; shortname = Build.shortFilename(this.file.name, this.isReply); if (fullname === shortname) { - return x.innerHTML += E(fullname); + return FileInfo.innerHTML += E(fullname); } else { - return x.innerHTML += "" + (E(shortname)) + "" + (E(fullname)) + ""; + return FileInfo.innerHTML += "" + (E(shortname)) + "" + (E(fullname)) + ""; } }, - N: function(x) { - return x.innerHTML += E(this.file.name); + N: function() { + return FileInfo.innerHTML += E(this.file.name); }, - p: function(x) { + p: function() { if (this.file.isSpoiler) { - return x.innerHTML += 'Spoiler, '; + return FileInfo.innerHTML += 'Spoiler, '; } }, - s: function(x) { - return x.innerHTML += E(this.file.size); + s: function() { + return FileInfo.innerHTML += E(this.file.size); }, - B: function(x) { + B: function() { var sizeB; sizeB = Math.round(this.file.sizeInBytes); - return x.innerHTML += "" + (+sizeB) + " Bytes"; + return FileInfo.innerHTML += "" + (+sizeB) + " Bytes"; }, - K: function(x) { + K: function() { var sizeKB; sizeKB = Math.round(this.file.sizeInBytes / 1024); - return x.innerHTML += "" + (+sizeKB) + " KB"; + return FileInfo.innerHTML += "" + (+sizeKB) + " KB"; }, - M: function(x) { + M: function() { var sizeMB; sizeMB = Math.round(this.file.sizeInBytes / 1048576 * 100) / 100; - return x.innerHTML += "" + (+sizeMB) + " MB"; + return FileInfo.innerHTML += "" + (+sizeMB) + " MB"; }, - r: function(x) { + r: function() { var dim; dim = this.file.dimensions || 'PDF'; - return x.innerHTML += E(dim); + return FileInfo.innerHTML += E(dim); }, - '%': function(x) { - return x.innerHTML += '%'; + '%': function() { + return FileInfo.innerHTML += '%'; } } }; @@ -12402,7 +12400,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"]); @@ -13254,7 +13252,7 @@ } if (previousversion) { el = $.el('span', { - innerHTML: '4chan X has been updated to version 1.8.2.' + innerHTML: '4chan X has been updated to version 1.8.3.' }); new Notice('info', el, 15); } else { diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index bfa4359fe..250432a0b 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 76e18bb70..e69ff2f65 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.8.2 +// @version 1.8.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 42fe6342f..76593200f 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.2 +// @version 1.8.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.8.2 - 2014-06-30 +* 4chan X - Version 1.8.3 - 2014-07-01 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -375,7 +375,7 @@ doc = d.documentElement; g = { - VERSION: '1.8.2', + VERSION: '1.8.3', NAMESPACE: '4chan X.', boards: {} }; @@ -1108,7 +1108,7 @@ size *= 1024; } this.file.sizeInBytes = size; - this.file.thumbURL = that.isArchived ? thumb.src : "" + location.protocol + "//t.4cdn.org/" + this.board + "/" + (this.file.URL.match(/(\d+)\./)[1]) + "s.jpg"; + this.file.thumbURL = "" + location.protocol + "//t.4cdn.org/" + this.board + "/" + (this.file.URL.match(/(\d+)\./)[1]) + "s.jpg"; this.file.isImage = /(jpg|png|gif)$/i.test(this.file.URL); this.file.isVideo = /webm$/i.test(this.file.URL); nameNode = $('a', fileText); @@ -3578,6 +3578,7 @@ post = new Post(Build.post(o), thread, board, { isArchived: true }); + post.file.thumbURL = o.file.turl; post.isFetchedQuote = true; Main.callbackNodes(Post, [post]); return Get.insert(post, root, context); @@ -11421,84 +11422,81 @@ return FileInfo.format(Conf['fileInfo'], this, this.file.text.firstElementChild); }, format: function(formatString, post, outputNode) { - var output; - output = { - innerHTML: '' - }; + FileInfo.innerHTML = ''; formatString.replace(/%(.)|[^%]+/g, function(s, c) { if (c in FileInfo.formatters) { - FileInfo.formatters[c].call(post, output); + FileInfo.formatters[c].call(post); } else { - output.innerHTML += E(s); + FileInfo.innerHTML += E(s); } return ''; }); - return outputNode.innerHTML = output.innerHTML; + return outputNode.innerHTML = FileInfo.innerHTML; }, formatters: { - t: function(x) { + t: function() { var timestamp; timestamp = this.file.URL.match(/\d+\..+$/)[0]; - return x.innerHTML += E(timestamp); + return FileInfo.innerHTML += E(timestamp); }, - T: function(x) { - x.innerHTML += ""; - FileInfo.formatters.t.call(this, x); - return x.innerHTML += ''; + T: function() { + FileInfo.innerHTML += ""; + FileInfo.formatters.t.call(this); + return FileInfo.innerHTML += ''; }, - l: function(x) { - x.innerHTML += ""; - FileInfo.formatters.n.call(this, x); - return x.innerHTML += ''; + l: function() { + FileInfo.innerHTML += ""; + FileInfo.formatters.n.call(this); + return FileInfo.innerHTML += ''; }, - L: function(x) { - x.innerHTML += ""; - FileInfo.formatters.N.call(this, x); - return x.innerHTML += ''; + L: function() { + FileInfo.innerHTML += ""; + FileInfo.formatters.N.call(this); + return FileInfo.innerHTML += ''; }, - n: function(x) { + n: function() { var fullname, shortname; fullname = this.file.name; shortname = Build.shortFilename(this.file.name, this.isReply); if (fullname === shortname) { - return x.innerHTML += E(fullname); + return FileInfo.innerHTML += E(fullname); } else { - return x.innerHTML += "" + (E(shortname)) + "" + (E(fullname)) + ""; + return FileInfo.innerHTML += "" + (E(shortname)) + "" + (E(fullname)) + ""; } }, - N: function(x) { - return x.innerHTML += E(this.file.name); + N: function() { + return FileInfo.innerHTML += E(this.file.name); }, - p: function(x) { + p: function() { if (this.file.isSpoiler) { - return x.innerHTML += 'Spoiler, '; + return FileInfo.innerHTML += 'Spoiler, '; } }, - s: function(x) { - return x.innerHTML += E(this.file.size); + s: function() { + return FileInfo.innerHTML += E(this.file.size); }, - B: function(x) { + B: function() { var sizeB; sizeB = Math.round(this.file.sizeInBytes); - return x.innerHTML += "" + (+sizeB) + " Bytes"; + return FileInfo.innerHTML += "" + (+sizeB) + " Bytes"; }, - K: function(x) { + K: function() { var sizeKB; sizeKB = Math.round(this.file.sizeInBytes / 1024); - return x.innerHTML += "" + (+sizeKB) + " KB"; + return FileInfo.innerHTML += "" + (+sizeKB) + " KB"; }, - M: function(x) { + M: function() { var sizeMB; sizeMB = Math.round(this.file.sizeInBytes / 1048576 * 100) / 100; - return x.innerHTML += "" + (+sizeMB) + " MB"; + return FileInfo.innerHTML += "" + (+sizeMB) + " MB"; }, - r: function(x) { + r: function() { var dim; dim = this.file.dimensions || 'PDF'; - return x.innerHTML += E(dim); + return FileInfo.innerHTML += E(dim); }, - '%': function(x) { - return x.innerHTML += '%'; + '%': function() { + return FileInfo.innerHTML += '%'; } } }; @@ -12403,7 +12401,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"]); @@ -13255,7 +13253,7 @@ } if (previousversion) { el = $.el('span', { - innerHTML: '4chan X has been updated to version 1.8.2.' + innerHTML: '4chan X has been updated to version 1.8.3.' }); new Notice('info', el, 15); } else { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 6ad2e03ec..5487f095b 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 468f43200..cf41680e7 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 be453a9a0..780506e3b 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 0bff885d6..65135c8aa 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "1.8.2", + "version": "1.8.3", "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X",