From 1491851eab548caf8587ec640243673dd16214ae Mon Sep 17 00:00:00 2001 From: Jordan Bates Date: Wed, 14 Aug 2013 17:24:55 -0700 Subject: [PATCH 1/3] Release 4chan X v1.2.29. --- CHANGELOG.md | 6 ++++++ LICENSE | 2 +- builds/4chan-X.meta.js | 2 +- builds/4chan-X.user.js | 6 +++--- builds/crx/manifest.json | 2 +- builds/crx/script.js | 4 ++-- latest.js | 2 +- package.json | 2 +- 8 files changed, 16 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77b7ac8e0..4f7ee091c 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +### v1.2.29 +*2013-08-14* + +**Zixaphir**: +- Fix issue that caused 4chan X to show settings after every page load + ### v1.2.28 *2013-08-14* diff --git a/LICENSE b/LICENSE index a3e6d976a..4a2dd0d03 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.2.28 - 2013-08-14 +* 4chan X - Version 1.2.29 - 2013-08-14 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index 8cb87aec6..5a8ad9123 100755 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.2.28 +// @version 1.2.29 // @namespace 4chan-X // @description Cross-browser userscript for maximum lurking on 4chan. // @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index d6e1f4e74..3d2651ad1 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.2.28 +// @version 1.2.29 // @namespace 4chan-X // @description Cross-browser userscript for maximum lurking on 4chan. // @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -19,7 +19,7 @@ // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC // ==/UserScript== /* -* 4chan X - Version 1.2.28 - 2013-08-14 +* 4chan X - Version 1.2.29 - 2013-08-14 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -326,7 +326,7 @@ doc = d.documentElement; g = { - VERSION: '1.2.28', + VERSION: '1.2.29', NAMESPACE: '4chan X.', boards: {}, threads: {}, diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json index b05f0afcd..2353e1607 100755 --- a/builds/crx/manifest.json +++ b/builds/crx/manifest.json @@ -1,6 +1,6 @@ { "name": "4chan X", - "version": "1.2.28", + "version": "1.2.29", "manifest_version": 2, "description": "Cross-browser userscript for maximum lurking on 4chan.", "icons": { diff --git a/builds/crx/script.js b/builds/crx/script.js index 67d7c57b6..81ea79b84 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.2.28 - 2013-08-14 +* 4chan X - Version 1.2.29 - 2013-08-14 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -308,7 +308,7 @@ doc = d.documentElement; g = { - VERSION: '1.2.28', + VERSION: '1.2.29', NAMESPACE: '4chan X.', boards: {}, threads: {}, diff --git a/latest.js b/latest.js index 2bc1a0dda..0af3ad794 100755 --- a/latest.js +++ b/latest.js @@ -1 +1 @@ -postMessage({version:'1.2.28'},'*') +postMessage({version:'1.2.29'},'*') diff --git a/package.json b/package.json index 95bf2d050..fc84e2550 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "1.2.28", + "version": "1.2.29", "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { From 30262990871d2db9fd99c701cbbdcade39627c1e Mon Sep 17 00:00:00 2001 From: Jordan Bates Date: Wed, 14 Aug 2013 18:34:45 -0700 Subject: [PATCH 2/3] Pale Moon support --- builds/4chan-X.user.js | 14 ++++++++++++-- builds/crx/script.js | 14 ++++++++++++-- src/Posting/QuickReply.coffee | 8 +++++++- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 3d2651ad1..dcf07d63b 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -5441,9 +5441,19 @@ return QR.nodes.fileInput.click(); }, fileInput: function(files) { - var file, length, max, post, _i, _len; + var check, err, file, length, max, post, _i, _len; - if (files instanceof Event) { + try { + if (files instanceof Event) { + check = true; + } + } catch (_error) { + err = _error; + if (this instanceof Element) { + check = true; + } + } + if (check) { files = __slice.call(this.files); QR.nodes.fileInput.value = null; } diff --git a/builds/crx/script.js b/builds/crx/script.js index 81ea79b84..e494f5160 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -5451,9 +5451,19 @@ return QR.nodes.fileInput.click(); }, fileInput: function(files) { - var file, length, max, post, _i, _len; + var check, err, file, length, max, post, _i, _len; - if (files instanceof Event) { + try { + if (files instanceof Event) { + check = true; + } + } catch (_error) { + err = _error; + if (this instanceof Element) { + check = true; + } + } + if (check) { files = __slice.call(this.files); QR.nodes.fileInput.value = null; } diff --git a/src/Posting/QuickReply.coffee b/src/Posting/QuickReply.coffee index d0dc911b5..be71207b9 100755 --- a/src/Posting/QuickReply.coffee +++ b/src/Posting/QuickReply.coffee @@ -443,7 +443,13 @@ QR = QR.nodes.fileInput.click() fileInput: (files) -> - if files instanceof Event # file input + try + if files instanceof Event # file input + check = true + catch err + if @ instanceof Element # file input + check = true + if check files = [@files...] QR.nodes.fileInput.value = null # Don't hold the files from being modified on windows {length} = files From 5e5c81a5761e93920b77aa7565fb5c3b659548d2 Mon Sep 17 00:00:00 2001 From: Jordan Bates Date: Thu, 15 Aug 2013 19:22:25 -0700 Subject: [PATCH 3/3] Fix #146 --- LICENSE | 2 +- builds/4chan-X.user.js | 4 ++-- builds/crx/script.js | 4 ++-- src/Miscellaneous/ColorUserIDs.coffee | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LICENSE b/LICENSE index 4a2dd0d03..a68102944 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.2.29 - 2013-08-14 +* 4chan X - Version 1.2.29 - 2013-08-15 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index ef27f218a..93fbbed62 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -19,7 +19,7 @@ // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC // ==/UserScript== /* -* 4chan X - Version 1.2.29 - 2013-08-14 +* 4chan X - Version 1.2.29 - 2013-08-15 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -8847,7 +8847,7 @@ IDColor = { init: function() { - if (g.VIEW === 'catalog' || !Conf['Color user IDs']) { + if (g.VIEW === 'catalog' || !Conf['Color User IDs']) { return; } return Post.prototype.callbacks.push({ diff --git a/builds/crx/script.js b/builds/crx/script.js index 9cae84b38..bc352c6de 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.2.29 - 2013-08-14 +* 4chan X - Version 1.2.29 - 2013-08-15 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -8837,7 +8837,7 @@ IDColor = { init: function() { - if (g.VIEW === 'catalog' || !Conf['Color user IDs']) { + if (g.VIEW === 'catalog' || !Conf['Color User IDs']) { return; } return Post.prototype.callbacks.push({ diff --git a/src/Miscellaneous/ColorUserIDs.coffee b/src/Miscellaneous/ColorUserIDs.coffee index 754dd5add..4bc8ed15c 100755 --- a/src/Miscellaneous/ColorUserIDs.coffee +++ b/src/Miscellaneous/ColorUserIDs.coffee @@ -1,6 +1,6 @@ IDColor = init: -> - return if g.VIEW is 'catalog' or !Conf['Color user IDs'] + return if g.VIEW is 'catalog' or !Conf['Color User IDs'] Post::callbacks.push name: 'Color User IDs'