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

Fix ExpandThread without JSON Navigation

Browse Source
This commit is contained in:
Zixaphir 2014-03-03 12:41:26 -07:00
parent b7585d9cd4
commit 7c28da181b
4 changed files with 50 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1878,7 +1878,7 @@
SimpleDict.prototype.forEach = function(fn) {
var key, _i, _len, _ref, _results;
_ref = __slice.call(this.keys);
_ref = this.keys;
_results = [];
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
key = _ref[_i];
@ -11304,17 +11304,26 @@
if (g.VIEW === 'thread' || !Conf['Thread Expansion']) {
return;
}
return $.on(d, 'IndexRefresh', this.onIndexRefresh);
return $.on(d, (Conf['JSON Navigation'] ? 'IndexRefresh' : '4chanXInitFinished'), this.onIndexRefresh);
},
setButton: function(thread) {
var a;
if (!(a = $.x('following-sibling::a[contains(@class,"summary")][1]', thread.OP.nodes.root))) {
var a, summary;
if (!(summary = $.x('following-sibling::*[contains(@class,"summary")][1]', thread.OP.nodes.root))) {
return;
}
a.textContent = ExpandThread.text.apply(ExpandThread, ['+'].concat(__slice.call(a.textContent.match(/\d+/g))));
return $.on(a, 'click', ExpandThread.cbToggle);
a = $.el('a', {
textContent: ExpandThread.text.apply(ExpandThread, ['+'].concat(__slice.call(summary.textContent.match(/\d+/g)))),
href: "" + thread.board.ID + "/res/" + thread.ID,
className: 'summary'
});
$.on(a, 'click', ExpandThread.cbToggle);
return $.replace(summary, a);
},
disconnect: function(refresh) {
disconnect: function() {
this.refresh();
return $.off(d, 'IndexRefresh', this.onIndexRefresh);
},
refresh: function(disconnect) {
var status, threadID, _ref, _ref1;
if (g.VIEW === 'thread' || !Conf['Thread Expansion']) {
return;
@ -11327,12 +11336,9 @@
}
delete ExpandThread.statuses[threadID];
}
if (!refresh) {
return $.off(d, 'IndexRefresh', this.onIndexRefresh);
}
},
onIndexRefresh: function() {
ExpandThread.disconnect(true);
ExpandThread.refresh();
return g.BOARD.threads.forEach(function(thread) {
return ExpandThread.setButton(thread);
});

28
builds/crx/script.js
View File

@ -1933,7 +1933,7 @@
SimpleDict.prototype.forEach = function(fn) {
var key, _i, _len, _ref, _results;
_ref = __slice.call(this.keys);
_ref = this.keys;
_results = [];
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
key = _ref[_i];
@ -11318,17 +11318,26 @@
if (g.VIEW === 'thread' || !Conf['Thread Expansion']) {
return;
}
return $.on(d, 'IndexRefresh', this.onIndexRefresh);
return $.on(d, (Conf['JSON Navigation'] ? 'IndexRefresh' : '4chanXInitFinished'), this.onIndexRefresh);
},
setButton: function(thread) {
var a;
if (!(a = $.x('following-sibling::a[contains(@class,"summary")][1]', thread.OP.nodes.root))) {
var a, summary;
if (!(summary = $.x('following-sibling::*[contains(@class,"summary")][1]', thread.OP.nodes.root))) {
return;
}
a.textContent = ExpandThread.text.apply(ExpandThread, ['+'].concat(__slice.call(a.textContent.match(/\d+/g))));
return $.on(a, 'click', ExpandThread.cbToggle);
a = $.el('a', {
textContent: ExpandThread.text.apply(ExpandThread, ['+'].concat(__slice.call(summary.textContent.match(/\d+/g)))),
href: "" + thread.board.ID + "/res/" + thread.ID,
className: 'summary'
});
$.on(a, 'click', ExpandThread.cbToggle);
return $.replace(summary, a);
},
disconnect: function(refresh) {
disconnect: function() {
this.refresh();
return $.off(d, 'IndexRefresh', this.onIndexRefresh);
},
refresh: function(disconnect) {
var status, threadID, _ref, _ref1;
if (g.VIEW === 'thread' || !Conf['Thread Expansion']) {
return;
@ -11341,12 +11350,9 @@
}
delete ExpandThread.statuses[threadID];
}
if (!refresh) {
return $.off(d, 'IndexRefresh', this.onIndexRefresh);
}
},
onIndexRefresh: function() {
ExpandThread.disconnect(true);
ExpandThread.refresh();
return g.BOARD.threads.forEach(function(thread) {
return ExpandThread.setButton(thread);
});

2
src/General/lib/simpledict.class
View File

@ -13,4 +13,4 @@ class SimpleDict
@keys.splice i, 1
delete @[key]
forEach: (fn) -> fn @[key] for key in [@keys...]
forEach: (fn) -> fn @[key] for key in @keys

23
src/Miscellaneous/ExpandThread.coffee
View File

@ -2,23 +2,30 @@ ExpandThread =
statuses: {}
init: ->
return if g.VIEW is 'thread' or !Conf['Thread Expansion']
$.on d, 'IndexRefresh', @onIndexRefresh
$.on d, (if Conf['JSON Navigation'] then 'IndexRefresh' else '4chanXInitFinished'), @onIndexRefresh
setButton: (thread) ->
return unless a = $.x 'following-sibling::a[contains(@class,"summary")][1]', thread.OP.nodes.root
a.textContent = ExpandThread.text '+', a.textContent.match(/\d+/g)...
return unless summary = $.x 'following-sibling::*[contains(@class,"summary")][1]', thread.OP.nodes.root
a = $.el 'a',
textContent: ExpandThread.text '+', summary.textContent.match(/\d+/g)...
href: "#{thread.board.ID}/res/#{thread.ID}"
className: 'summary'
$.on a, 'click', ExpandThread.cbToggle
disconnect: (refresh) ->
$.replace summary, a
disconnect: ->
@refresh()
$.off d, 'IndexRefresh', @onIndexRefresh
refresh: (disconnect) ->
return if g.VIEW is 'thread' or !Conf['Thread Expansion']
for threadID, status of ExpandThread.statuses
status.req?.abort()
delete ExpandThread.statuses[threadID]
$.off d, 'IndexRefresh', @onIndexRefresh unless refresh
return
onIndexRefresh: ->
ExpandThread.disconnect true
ExpandThread.refresh()
g.BOARD.threads.forEach (thread) ->
ExpandThread.setButton thread