diff --git a/CHANGELOG.md b/CHANGELOG.md index 9978c0c98..8b86b4e44 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ The links to individual versions below are to copies of the script with the upda ## v1.10.0 +**v1.10.0.3** *(2015-02-11)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.3/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.3/builds/4chan-X-noupdate.crx "Chromium version")] +- Merge v1.9.23.10: 4chan has moved thumbnails to i.4cdn.org. + **v1.10.0.2** *(2015-02-09)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.2/builds/4chan-X-noupdate.crx "Chromium version")] - The `Catalog Links` feature no longer forces a non-catalog index mode if the header menu item is unchecked. diff --git a/LICENSE b/LICENSE index 9964df732..1dd292808 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.10.0.2 +* 4chan X - Version 1.10.0.3 * * 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 9087c5f80..0c84e0d51 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 e81646979..4b75c6cf5 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.10.0.2 +// @version 1.10.0.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 2356222db..e1b5620f0 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.10.0.2 +// @version 1.10.0.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.10.0.2 +* 4chan X - Version 1.10.0.3 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -405,7 +405,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.0.2', + VERSION: '1.10.0.3', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -1343,7 +1343,7 @@ size *= 1024; } this.file.sizeInBytes = size; - this.file.thumbURL = "" + location.protocol + "//t.4cdn.org/" + this.board + "/" + (this.file.URL.match(/(\d+)\./)[1]) + "s.jpg"; + this.file.thumbURL = "" + location.protocol + "//i.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); @@ -2242,7 +2242,7 @@ width: data.media.media_w, MD5: data.media.media_hash, size: data.media.media_size, - turl: data.media.thumb_link || ("//t.4cdn.org/" + this.boardID + "/" + data.media.preview_orig), + turl: data.media.thumb_link || ("//i.4cdn.org/" + this.boardID + "/" + data.media.preview_orig), theight: data.media.preview_h, twidth: data.media.preview_w, isSpoiler: data.media.spoiler === '1' @@ -3958,13 +3958,6 @@ return filename; } }, - thumbRotate: (function() { - var t; - t = 0; - return function() { - return t = (t ? 0 : 1); - }; - })(), sameThread: function(boardID, threadID) { return g.VIEW === 'thread' && g.BOARD.ID === boardID && g.THREADID === +threadID; }, @@ -4011,7 +4004,7 @@ width: data.w, MD5: data.md5, size: data.fsize, - turl: "//" + (Build.thumbRotate()) + ".t.4cdn.org/" + boardID + "/" + data.tim + "s.jpg", + turl: "//i.4cdn.org/" + boardID + "/" + data.tim + "s.jpg", theight: data.tn_h, twidth: data.tn_w, isSpoiler: !!data.spoiler, @@ -9014,7 +9007,7 @@ id: 'a-gallery' }); $.extend(dialog, { - innerHTML: "
× /
" + innerHTML: "
× /
" }); _ref = { buttons: '.gal-buttons', diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 5dc3f6cbf..96113fa09 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 e9e5f4c86..cfb5c66e6 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.10.0.2 +// @version 1.10.0.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.10.0.2 +* 4chan X - Version 1.10.0.3 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -404,7 +404,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.0.2', + VERSION: '1.10.0.3', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -1342,7 +1342,7 @@ size *= 1024; } this.file.sizeInBytes = size; - this.file.thumbURL = "" + location.protocol + "//t.4cdn.org/" + this.board + "/" + (this.file.URL.match(/(\d+)\./)[1]) + "s.jpg"; + this.file.thumbURL = "" + location.protocol + "//i.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); @@ -2241,7 +2241,7 @@ width: data.media.media_w, MD5: data.media.media_hash, size: data.media.media_size, - turl: data.media.thumb_link || ("//t.4cdn.org/" + this.boardID + "/" + data.media.preview_orig), + turl: data.media.thumb_link || ("//i.4cdn.org/" + this.boardID + "/" + data.media.preview_orig), theight: data.media.preview_h, twidth: data.media.preview_w, isSpoiler: data.media.spoiler === '1' @@ -3957,13 +3957,6 @@ return filename; } }, - thumbRotate: (function() { - var t; - t = 0; - return function() { - return t = (t ? 0 : 1); - }; - })(), sameThread: function(boardID, threadID) { return g.VIEW === 'thread' && g.BOARD.ID === boardID && g.THREADID === +threadID; }, @@ -4010,7 +4003,7 @@ width: data.w, MD5: data.md5, size: data.fsize, - turl: "//" + (Build.thumbRotate()) + ".t.4cdn.org/" + boardID + "/" + data.tim + "s.jpg", + turl: "//i.4cdn.org/" + boardID + "/" + data.tim + "s.jpg", theight: data.tn_h, twidth: data.tn_w, isSpoiler: !!data.spoiler, @@ -9013,7 +9006,7 @@ id: 'a-gallery' }); $.extend(dialog, { - innerHTML: "
× /
" + innerHTML: "
× /
" }); _ref = { buttons: '.gal-buttons', diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 1fbcfa9b9..1cf1b0397 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 9058f7bbb..aae7c4daf 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.10.0.2 +// @version 1.10.0.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 4dc00ce91..3bb08a821 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.10.0.2 +// @version 1.10.0.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -25,7 +25,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.10.0.2 +* 4chan X - Version 1.10.0.3 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -405,7 +405,7 @@ doc = d.documentElement; g = { - VERSION: '1.10.0.2', + VERSION: '1.10.0.3', NAMESPACE: '4chan X.', NAME: '4chan X', FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions', @@ -1343,7 +1343,7 @@ size *= 1024; } this.file.sizeInBytes = size; - this.file.thumbURL = "" + location.protocol + "//t.4cdn.org/" + this.board + "/" + (this.file.URL.match(/(\d+)\./)[1]) + "s.jpg"; + this.file.thumbURL = "" + location.protocol + "//i.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); @@ -2242,7 +2242,7 @@ width: data.media.media_w, MD5: data.media.media_hash, size: data.media.media_size, - turl: data.media.thumb_link || ("//t.4cdn.org/" + this.boardID + "/" + data.media.preview_orig), + turl: data.media.thumb_link || ("//i.4cdn.org/" + this.boardID + "/" + data.media.preview_orig), theight: data.media.preview_h, twidth: data.media.preview_w, isSpoiler: data.media.spoiler === '1' @@ -3958,13 +3958,6 @@ return filename; } }, - thumbRotate: (function() { - var t; - t = 0; - return function() { - return t = (t ? 0 : 1); - }; - })(), sameThread: function(boardID, threadID) { return g.VIEW === 'thread' && g.BOARD.ID === boardID && g.THREADID === +threadID; }, @@ -4011,7 +4004,7 @@ width: data.w, MD5: data.md5, size: data.fsize, - turl: "//" + (Build.thumbRotate()) + ".t.4cdn.org/" + boardID + "/" + data.tim + "s.jpg", + turl: "//i.4cdn.org/" + boardID + "/" + data.tim + "s.jpg", theight: data.tn_h, twidth: data.tn_w, isSpoiler: !!data.spoiler, @@ -9014,7 +9007,7 @@ id: 'a-gallery' }); $.extend(dialog, { - innerHTML: "
× /
" + innerHTML: "
× /
" }); _ref = { buttons: '.gal-buttons', diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index d0aafd2a6..9929f711f 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 eb15fe431..d9a74cc79 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 366e427eb..bf3671bd1 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 08f568fff..6c3a3741c 100755 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X", - "version": "1.10.0.2", + "version": "1.10.0.3", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",