Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Release 4chan X v1.13.1.1.

Browse Source
This commit is contained in:
ccd0 2016-11-07 03:14:32 -08:00
parent 379dd13e0f
commit 2fd909e7b7
13 changed files with 60 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -4,6 +4,9 @@
### v1.13.1 ### v1.13.1
**v1.13.1.1** *(2016-11-07)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.1.1/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.1.1/builds/4chan-X-noupdate.crx)]
- Fix bug causing replies to not immediately show when catalog thread is clicked.
**v1.13.1.0** *(2016-11-07)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.1.0/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.1.0/builds/4chan-X-noupdate.crx)] **v1.13.1.0** *(2016-11-07)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.1.0/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.1.0/builds/4chan-X-noupdate.crx)]
- Based on v1.13.0.22. - Based on v1.13.0.22.
- Only activate `Catalog Hover Expand` when catalog is clicked. Deactivate on second click. Turn `Catalog Hover Expand` back on by default. - Only activate `Catalog Hover Expand` when catalog is clicked. Deactivate on second click. Turn `Catalog Hover Expand` back on by default.

BIN
builds/4chan-X-beta.crx
View File

Binary file not shown.

2
builds/4chan-X-beta.meta.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X beta // @name 4chan X beta
// @version 1.13.1.0 // @version 1.13.1.1
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

40
builds/4chan-X-beta.user.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X beta // @name 4chan X beta
// @version 1.13.1.0 // @version 1.13.1.1
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -147,7 +147,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.13.1.0', VERSION: '1.13.1.1',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -8509,10 +8509,13 @@ Get = (function() {
return excerpt; return excerpt;
}, },
threadFromRoot: function(root) { threadFromRoot: function(root) {
if (root == null) {
return null;
}
return g.threads[g.BOARD + "." + root.id.slice(1)]; return g.threads[g.BOARD + "." + root.id.slice(1)];
}, },
threadFromNode: function(node) { threadFromNode: function(node) {
return Get.threadFromRoot($.x('ancestor::div[@class="thread"]', node)); return Get.threadFromRoot($.x('ancestor-or-self::div[contains(concat(" ",@class," ")," thread ")]', node));
}, },
postFromRoot: function(root) { postFromRoot: function(root) {
var index, post; var index, post;
@ -9603,11 +9606,12 @@ Index = (function() {
} }
}, },
hoverToggle: function(e) { hoverToggle: function(e) {
var post; var thread;
if (Conf['Catalog Hover Expand'] && !$.modifiedClick(e) && !$.x('ancestor-or-self::a', e.target)) { if (Conf['Catalog Hover Expand'] && !$.modifiedClick(e) && !$.x('ancestor-or-self::a', e.target)) {
$.toggleClass(doc, 'catalog-hover-expand'); $.toggleClass(doc, 'catalog-hover-expand');
if ((post = Get.postFromNode(e.target))) { if ((thread = Get.threadFromNode(e.target))) {
return Index.cb.hoverAdjust.call(post.nodes); Index.cb.catalogReplies.call(thread);
return Index.cb.hoverAdjust.call(thread.OP.nodes);
} }
} }
}, },
@ -9661,11 +9665,9 @@ Index = (function() {
return Index.update(); return Index.update();
}, },
catalogReplies: function() { catalogReplies: function() {
if (!(Conf['Show Replies'] && $.hasClass(doc, 'catalog-hover-expand'))) { if (Conf['Show Replies'] && $.hasClass(doc, 'catalog-hover-expand') && !this.catalogView.nodes.replies) {
return; return Index.buildCatalogReplies(this);
} }
$.off(this, 'mouseenter', Index.cb.catalogReplies);
return Index.buildCatalogReplies(Get.threadFromRoot(this));
}, },
hoverAdjust: function() { hoverAdjust: function() {
var rect, style, x; var rect, style, x;
@ -10109,7 +10111,7 @@ Index = (function() {
thread.setStatus('Sticky', !!threadData.sticky); thread.setStatus('Sticky', !!threadData.sticky);
thread.setStatus('Closed', !!threadData.closed); thread.setStatus('Closed', !!threadData.closed);
} }
if (thread.catalogView && (isStale || !(isCatalog && Conf['Show Replies'] && Conf['Catalog Hover Expand']))) { if (thread.catalogView) {
$.rm(thread.catalogView.nodes.replies); $.rm(thread.catalogView.nodes.replies);
thread.catalogView.nodes.replies = null; thread.catalogView.nodes.replies = null;
} }
@ -10218,22 +10220,14 @@ Index = (function() {
} }
}, },
buildCatalogReplies: function(thread) { buildCatalogReplies: function(thread) {
var data, k, l, lastReplies, len, len1, nodes, ref, replies, reply, timeEl; var data, k, lastReplies, len, nodes, replies, reply;
nodes = thread.catalogView.nodes; nodes = thread.catalogView.nodes;
if (!(lastReplies = Index.liveThreadDict[thread.ID].last_replies)) { if (!(lastReplies = Index.liveThreadDict[thread.ID].last_replies)) {
return; return;
} }
if (nodes.replies) {
ref = $$('time', nodes.replies);
for (k = 0, len = ref.length; k < len; k++) {
timeEl = ref[k];
RelativeDates.update(timeEl);
}
return;
}
replies = []; replies = [];
for (l = 0, len1 = lastReplies.length; l < len1; l++) { for (k = 0, len = lastReplies.length; k < len; k++) {
data = lastReplies[l]; data = lastReplies[k];
if (PostHiding.isHidden(g.BOARD.ID, thread.ID, data.no)) { if (PostHiding.isHidden(g.BOARD.ID, thread.ID, data.no)) {
continue; continue;
} }
@ -10424,7 +10418,7 @@ Index = (function() {
thread.OP.setCatalogOP(true); thread.OP.setCatalogOP(true);
$.add(thread.catalogView.nodes.root, thread.OP.nodes.root); $.add(thread.catalogView.nodes.root, thread.OP.nodes.root);
nodes.push(thread.catalogView.nodes.root); nodes.push(thread.catalogView.nodes.root);
$.on(thread.catalogView.nodes.root, 'mouseenter', Index.cb.catalogReplies); $.on(thread.catalogView.nodes.root, 'mouseenter', Index.cb.catalogReplies.bind(thread));
$.on(thread.OP.nodes.root, 'mouseenter', Index.cb.hoverAdjust.bind(thread.OP.nodes)); $.on(thread.OP.nodes.root, 'mouseenter', Index.cb.hoverAdjust.bind(thread.OP.nodes));
} }
$.add(Index.root, nodes); $.add(Index.root, nodes);

BIN
builds/4chan-X-noupdate.crx
View File

Binary file not shown.

40
builds/4chan-X-noupdate.user.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.13.1.0 // @version 1.13.1.1
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -147,7 +147,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.13.1.0', VERSION: '1.13.1.1',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -8509,10 +8509,13 @@ Get = (function() {
return excerpt; return excerpt;
}, },
threadFromRoot: function(root) { threadFromRoot: function(root) {
if (root == null) {
return null;
}
return g.threads[g.BOARD + "." + root.id.slice(1)]; return g.threads[g.BOARD + "." + root.id.slice(1)];
}, },
threadFromNode: function(node) { threadFromNode: function(node) {
return Get.threadFromRoot($.x('ancestor::div[@class="thread"]', node)); return Get.threadFromRoot($.x('ancestor-or-self::div[contains(concat(" ",@class," ")," thread ")]', node));
}, },
postFromRoot: function(root) { postFromRoot: function(root) {
var index, post; var index, post;
@ -9603,11 +9606,12 @@ Index = (function() {
} }
}, },
hoverToggle: function(e) { hoverToggle: function(e) {
var post; var thread;
if (Conf['Catalog Hover Expand'] && !$.modifiedClick(e) && !$.x('ancestor-or-self::a', e.target)) { if (Conf['Catalog Hover Expand'] && !$.modifiedClick(e) && !$.x('ancestor-or-self::a', e.target)) {
$.toggleClass(doc, 'catalog-hover-expand'); $.toggleClass(doc, 'catalog-hover-expand');
if ((post = Get.postFromNode(e.target))) { if ((thread = Get.threadFromNode(e.target))) {
return Index.cb.hoverAdjust.call(post.nodes); Index.cb.catalogReplies.call(thread);
return Index.cb.hoverAdjust.call(thread.OP.nodes);
} }
} }
}, },
@ -9661,11 +9665,9 @@ Index = (function() {
return Index.update(); return Index.update();
}, },
catalogReplies: function() { catalogReplies: function() {
if (!(Conf['Show Replies'] && $.hasClass(doc, 'catalog-hover-expand'))) { if (Conf['Show Replies'] && $.hasClass(doc, 'catalog-hover-expand') && !this.catalogView.nodes.replies) {
return; return Index.buildCatalogReplies(this);
} }
$.off(this, 'mouseenter', Index.cb.catalogReplies);
return Index.buildCatalogReplies(Get.threadFromRoot(this));
}, },
hoverAdjust: function() { hoverAdjust: function() {
var rect, style, x; var rect, style, x;
@ -10109,7 +10111,7 @@ Index = (function() {
thread.setStatus('Sticky', !!threadData.sticky); thread.setStatus('Sticky', !!threadData.sticky);
thread.setStatus('Closed', !!threadData.closed); thread.setStatus('Closed', !!threadData.closed);
} }
if (thread.catalogView && (isStale || !(isCatalog && Conf['Show Replies'] && Conf['Catalog Hover Expand']))) { if (thread.catalogView) {
$.rm(thread.catalogView.nodes.replies); $.rm(thread.catalogView.nodes.replies);
thread.catalogView.nodes.replies = null; thread.catalogView.nodes.replies = null;
} }
@ -10218,22 +10220,14 @@ Index = (function() {
} }
}, },
buildCatalogReplies: function(thread) { buildCatalogReplies: function(thread) {
var data, k, l, lastReplies, len, len1, nodes, ref, replies, reply, timeEl; var data, k, lastReplies, len, nodes, replies, reply;
nodes = thread.catalogView.nodes; nodes = thread.catalogView.nodes;
if (!(lastReplies = Index.liveThreadDict[thread.ID].last_replies)) { if (!(lastReplies = Index.liveThreadDict[thread.ID].last_replies)) {
return; return;
} }
if (nodes.replies) {
ref = $$('time', nodes.replies);
for (k = 0, len = ref.length; k < len; k++) {
timeEl = ref[k];
RelativeDates.update(timeEl);
}
return;
}
replies = []; replies = [];
for (l = 0, len1 = lastReplies.length; l < len1; l++) { for (k = 0, len = lastReplies.length; k < len; k++) {
data = lastReplies[l]; data = lastReplies[k];
if (PostHiding.isHidden(g.BOARD.ID, thread.ID, data.no)) { if (PostHiding.isHidden(g.BOARD.ID, thread.ID, data.no)) {
continue; continue;
} }
@ -10424,7 +10418,7 @@ Index = (function() {
thread.OP.setCatalogOP(true); thread.OP.setCatalogOP(true);
$.add(thread.catalogView.nodes.root, thread.OP.nodes.root); $.add(thread.catalogView.nodes.root, thread.OP.nodes.root);
nodes.push(thread.catalogView.nodes.root); nodes.push(thread.catalogView.nodes.root);
$.on(thread.catalogView.nodes.root, 'mouseenter', Index.cb.catalogReplies); $.on(thread.catalogView.nodes.root, 'mouseenter', Index.cb.catalogReplies.bind(thread));
$.on(thread.OP.nodes.root, 'mouseenter', Index.cb.hoverAdjust.bind(thread.OP.nodes)); $.on(thread.OP.nodes.root, 'mouseenter', Index.cb.hoverAdjust.bind(thread.OP.nodes));
} }
$.add(Index.root, nodes); $.add(Index.root, nodes);

BIN
builds/4chan-X.crx
View File

Binary file not shown.

2
builds/4chan-X.meta.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.13.1.0 // @version 1.13.1.1
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

40
builds/4chan-X.user.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.13.1.0 // @version 1.13.1.1
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -147,7 +147,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.13.1.0', VERSION: '1.13.1.1',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -8509,10 +8509,13 @@ Get = (function() {
return excerpt; return excerpt;
}, },
threadFromRoot: function(root) { threadFromRoot: function(root) {
if (root == null) {
return null;
}
return g.threads[g.BOARD + "." + root.id.slice(1)]; return g.threads[g.BOARD + "." + root.id.slice(1)];
}, },
threadFromNode: function(node) { threadFromNode: function(node) {
return Get.threadFromRoot($.x('ancestor::div[@class="thread"]', node)); return Get.threadFromRoot($.x('ancestor-or-self::div[contains(concat(" ",@class," ")," thread ")]', node));
}, },
postFromRoot: function(root) { postFromRoot: function(root) {
var index, post; var index, post;
@ -9603,11 +9606,12 @@ Index = (function() {
} }
}, },
hoverToggle: function(e) { hoverToggle: function(e) {
var post; var thread;
if (Conf['Catalog Hover Expand'] && !$.modifiedClick(e) && !$.x('ancestor-or-self::a', e.target)) { if (Conf['Catalog Hover Expand'] && !$.modifiedClick(e) && !$.x('ancestor-or-self::a', e.target)) {
$.toggleClass(doc, 'catalog-hover-expand'); $.toggleClass(doc, 'catalog-hover-expand');
if ((post = Get.postFromNode(e.target))) { if ((thread = Get.threadFromNode(e.target))) {
return Index.cb.hoverAdjust.call(post.nodes); Index.cb.catalogReplies.call(thread);
return Index.cb.hoverAdjust.call(thread.OP.nodes);
} }
} }
}, },
@ -9661,11 +9665,9 @@ Index = (function() {
return Index.update(); return Index.update();
}, },
catalogReplies: function() { catalogReplies: function() {
if (!(Conf['Show Replies'] && $.hasClass(doc, 'catalog-hover-expand'))) { if (Conf['Show Replies'] && $.hasClass(doc, 'catalog-hover-expand') && !this.catalogView.nodes.replies) {
return; return Index.buildCatalogReplies(this);
} }
$.off(this, 'mouseenter', Index.cb.catalogReplies);
return Index.buildCatalogReplies(Get.threadFromRoot(this));
}, },
hoverAdjust: function() { hoverAdjust: function() {
var rect, style, x; var rect, style, x;
@ -10109,7 +10111,7 @@ Index = (function() {
thread.setStatus('Sticky', !!threadData.sticky); thread.setStatus('Sticky', !!threadData.sticky);
thread.setStatus('Closed', !!threadData.closed); thread.setStatus('Closed', !!threadData.closed);
} }
if (thread.catalogView && (isStale || !(isCatalog && Conf['Show Replies'] && Conf['Catalog Hover Expand']))) { if (thread.catalogView) {
$.rm(thread.catalogView.nodes.replies); $.rm(thread.catalogView.nodes.replies);
thread.catalogView.nodes.replies = null; thread.catalogView.nodes.replies = null;
} }
@ -10218,22 +10220,14 @@ Index = (function() {
} }
}, },
buildCatalogReplies: function(thread) { buildCatalogReplies: function(thread) {
var data, k, l, lastReplies, len, len1, nodes, ref, replies, reply, timeEl; var data, k, lastReplies, len, nodes, replies, reply;
nodes = thread.catalogView.nodes; nodes = thread.catalogView.nodes;
if (!(lastReplies = Index.liveThreadDict[thread.ID].last_replies)) { if (!(lastReplies = Index.liveThreadDict[thread.ID].last_replies)) {
return; return;
} }
if (nodes.replies) {
ref = $$('time', nodes.replies);
for (k = 0, len = ref.length; k < len; k++) {
timeEl = ref[k];
RelativeDates.update(timeEl);
}
return;
}
replies = []; replies = [];
for (l = 0, len1 = lastReplies.length; l < len1; l++) { for (k = 0, len = lastReplies.length; k < len; k++) {
data = lastReplies[l]; data = lastReplies[k];
if (PostHiding.isHidden(g.BOARD.ID, thread.ID, data.no)) { if (PostHiding.isHidden(g.BOARD.ID, thread.ID, data.no)) {
continue; continue;
} }
@ -10424,7 +10418,7 @@ Index = (function() {
thread.OP.setCatalogOP(true); thread.OP.setCatalogOP(true);
$.add(thread.catalogView.nodes.root, thread.OP.nodes.root); $.add(thread.catalogView.nodes.root, thread.OP.nodes.root);
nodes.push(thread.catalogView.nodes.root); nodes.push(thread.catalogView.nodes.root);
$.on(thread.catalogView.nodes.root, 'mouseenter', Index.cb.catalogReplies); $.on(thread.catalogView.nodes.root, 'mouseenter', Index.cb.catalogReplies.bind(thread));
$.on(thread.OP.nodes.root, 'mouseenter', Index.cb.hoverAdjust.bind(thread.OP.nodes)); $.on(thread.OP.nodes.root, 'mouseenter', Index.cb.hoverAdjust.bind(thread.OP.nodes));
} }
$.add(Index.root, nodes); $.add(Index.root, nodes);

BIN
builds/4chan-X.zip
View File

Binary file not shown.

2
builds/updates-beta.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'> <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'> <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.1.0' /> <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.1.1' />
</app> </app>
</gupdate> </gupdate>

2
builds/updates.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'> <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'> <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.13.1.0' /> <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.13.1.1' />
</app> </app>
</gupdate> </gupdate>

4
version.json
View File

@ -1,4 +1,4 @@
{ {
"version": "1.13.1.0", "version": "1.13.1.1",
"date": "2016-11-07T08:52:09.200Z" "date": "2016-11-07T11:05:03.448Z"
} }