diff --git a/CHANGELOG.md b/CHANGELOG.md index 619d11081..210d64b53 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### v1.7.61 +*2014-06-15* + **ccd0** - Fix new hiding/filtering bug from previous release. diff --git a/LICENSE b/LICENSE index b6f4dcd20..8023327d4 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.7.60 - 2014-06-15 +* 4chan X - Version 1.7.61 - 2014-06-15 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index e451e9f91..2f0f53abf 100755 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.7.60 +// @version 1.7.61 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 3460da809..438afdc87 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.7.60 +// @version 1.7.61 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.7.60 - 2014-06-15 +* 4chan X - Version 1.7.61 - 2014-06-15 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -374,7 +374,7 @@ doc = d.documentElement; g = { - VERSION: '1.7.60', + VERSION: '1.7.61', NAMESPACE: '4chan X.', boards: {} }; @@ -3488,6 +3488,7 @@ board = g.boards[boardID] || new Board(boardID); thread = g.threads["" + boardID + "." + threadID] || new Thread(threadID, board); post = new Post(Build.postFromObject(post, boardID), thread, board); + post.isFetchedQuote = true; Main.callbackNodes(Post, [post]); return Get.insert(post, root, context); }, @@ -3552,6 +3553,7 @@ post = new Post(Build.post(o, true), thread, board, { isArchived: true }); + post.isFetchedQuote = true; Main.callbackNodes(Post, [post]); return Get.insert(post, root, context); }, @@ -4182,7 +4184,7 @@ }, node: function() { var filter, key, result, value, _i, _len, _ref; - if (this.isClone || !this.nodes.root.parentNode) { + if (this.isClone || this.isFetchedQuote) { return; } for (key in Filter.filters) { @@ -4377,7 +4379,7 @@ }, node: function() { var data; - if (!this.isReply || this.isClone || !this.nodes.root.parentNode) { + if (!this.isReply || this.isClone || this.isFetchedQuote) { return; } if (data = PostHiding.db.get({ @@ -4665,7 +4667,7 @@ }, node: function() { var i, obj, quote, recursive, _i, _j, _len, _len1, _ref, _ref1; - if (this.isClone || !this.nodes.root.parentNode) { + if (this.isClone || this.isFetchedQuote) { return; } _ref = this.quotes; @@ -12480,7 +12482,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"]); @@ -13325,7 +13327,7 @@ } if (previousversion) { el = $.el('span', { - innerHTML: '4chan X has been updated to version 1.7.60.' + innerHTML: '4chan X has been updated to version 1.7.61.' }); new Notice('info', el, 15); } else { diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 2c5c45ad1..3ed8b2b51 100644 Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ diff --git a/builds/crx.crx b/builds/crx.crx index f550640fb..442a00a79 100644 Binary files a/builds/crx.crx and b/builds/crx.crx differ diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json index a6d6f69a4..1610dcce4 100755 --- a/builds/crx/manifest.json +++ b/builds/crx/manifest.json @@ -1,6 +1,6 @@ { "name": "4chan X", - "version": "1.7.60", + "version": "1.7.61", "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 e7be2a80b..ef7a67346 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.7.60 - 2014-06-15 +* 4chan X - Version 1.7.61 - 2014-06-15 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -349,7 +349,7 @@ doc = d.documentElement; g = { - VERSION: '1.7.60', + VERSION: '1.7.61', NAMESPACE: '4chan X.', boards: {} }; @@ -3523,6 +3523,7 @@ board = g.boards[boardID] || new Board(boardID); thread = g.threads["" + boardID + "." + threadID] || new Thread(threadID, board); post = new Post(Build.postFromObject(post, boardID), thread, board); + post.isFetchedQuote = true; Main.callbackNodes(Post, [post]); return Get.insert(post, root, context); }, @@ -3587,6 +3588,7 @@ post = new Post(Build.post(o, true), thread, board, { isArchived: true }); + post.isFetchedQuote = true; Main.callbackNodes(Post, [post]); return Get.insert(post, root, context); }, @@ -4207,7 +4209,7 @@ }, node: function() { var filter, key, result, value, _i, _len, _ref; - if (this.isClone || !this.nodes.root.parentNode) { + if (this.isClone || this.isFetchedQuote) { return; } for (key in Filter.filters) { @@ -4402,7 +4404,7 @@ }, node: function() { var data; - if (!this.isReply || this.isClone || !this.nodes.root.parentNode) { + if (!this.isReply || this.isClone || this.isFetchedQuote) { return; } if (data = PostHiding.db.get({ @@ -4690,7 +4692,7 @@ }, node: function() { var i, obj, quote, recursive, _i, _j, _len, _len1, _ref, _ref1; - if (this.isClone || !this.nodes.root.parentNode) { + if (this.isClone || this.isFetchedQuote) { return; } _ref = this.quotes; @@ -12474,7 +12476,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"]); @@ -13306,7 +13308,7 @@ } if (previousversion) { el = $.el('span', { - innerHTML: '4chan X has been updated to version 1.7.60.' + innerHTML: '4chan X has been updated to version 1.7.61.' }); new Notice('info', el, 15); } else { diff --git a/builds/updates.xml b/builds/updates.xml index dac6eaf34..f1a0ad769 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/builds/wcrx/manifest.json b/builds/wcrx/manifest.json index 84b17a97e..7c2754527 100644 --- a/builds/wcrx/manifest.json +++ b/builds/wcrx/manifest.json @@ -1,6 +1,6 @@ { "name": "4chan X", - "version": "1.7.60", + "version": "1.7.61", "manifest_version": 2, "description": "Cross-browser userscript for maximum lurking on 4chan.", "icons": { diff --git a/builds/wcrx/script.js b/builds/wcrx/script.js index e7be2a80b..ef7a67346 100644 --- a/builds/wcrx/script.js +++ b/builds/wcrx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.7.60 - 2014-06-15 +* 4chan X - Version 1.7.61 - 2014-06-15 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -349,7 +349,7 @@ doc = d.documentElement; g = { - VERSION: '1.7.60', + VERSION: '1.7.61', NAMESPACE: '4chan X.', boards: {} }; @@ -3523,6 +3523,7 @@ board = g.boards[boardID] || new Board(boardID); thread = g.threads["" + boardID + "." + threadID] || new Thread(threadID, board); post = new Post(Build.postFromObject(post, boardID), thread, board); + post.isFetchedQuote = true; Main.callbackNodes(Post, [post]); return Get.insert(post, root, context); }, @@ -3587,6 +3588,7 @@ post = new Post(Build.post(o, true), thread, board, { isArchived: true }); + post.isFetchedQuote = true; Main.callbackNodes(Post, [post]); return Get.insert(post, root, context); }, @@ -4207,7 +4209,7 @@ }, node: function() { var filter, key, result, value, _i, _len, _ref; - if (this.isClone || !this.nodes.root.parentNode) { + if (this.isClone || this.isFetchedQuote) { return; } for (key in Filter.filters) { @@ -4402,7 +4404,7 @@ }, node: function() { var data; - if (!this.isReply || this.isClone || !this.nodes.root.parentNode) { + if (!this.isReply || this.isClone || this.isFetchedQuote) { return; } if (data = PostHiding.db.get({ @@ -4690,7 +4692,7 @@ }, node: function() { var i, obj, quote, recursive, _i, _j, _len, _len1, _ref, _ref1; - if (this.isClone || !this.nodes.root.parentNode) { + if (this.isClone || this.isFetchedQuote) { return; } _ref = this.quotes; @@ -12474,7 +12476,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"]); @@ -13306,7 +13308,7 @@ } if (previousversion) { el = $.el('span', { - innerHTML: '4chan X has been updated to version 1.7.60.' + innerHTML: '4chan X has been updated to version 1.7.61.' }); new Notice('info', el, 15); } else { diff --git a/package.json b/package.json index 1ce5a085b..4dfba9d0e 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "1.7.60", + "version": "1.7.61", "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X",