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

Merge branch 'v3'

Browse Source 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2014-03-14 17:09:32 -07:00
commit f903abd165
5 changed files with 3 additions and 1559 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builds/appchan-x.user.js
View File

@ -3276,7 +3276,6 @@
this.thread.OP = this; this.thread.OP = this;
this.thread.isSticky = !!$('.stickyIcon', info); this.thread.isSticky = !!$('.stickyIcon', info);
this.thread.isClosed = !!$('.closedIcon', info); this.thread.isClosed = !!$('.closedIcon', info);
root.parentElement.dataset.fullID = this.fullID;
} }
this.info = {}; this.info = {};
if (subject = $('.subject', info)) { if (subject = $('.subject', info)) {
@ -6010,7 +6009,7 @@
return "/" + thread.board + "/ - " + excerpt; return "/" + thread.board + "/ - " + excerpt;
}, },
threadFromRoot: function(root) { threadFromRoot: function(root) {
return g.threads[root.dataset.fullID]; return g.threads[$('.opcontainer', root).dataset.fullID];
}, },
threadFromNode: function(node) { threadFromNode: function(node) {
return Get.threadFromRoot($.x('ancestor::div[@class="thread"]', node)); return Get.threadFromRoot($.x('ancestor::div[@class="thread"]', node));

3
builds/crx/script.js
View File

@ -3329,7 +3329,6 @@
this.thread.OP = this; this.thread.OP = this;
this.thread.isSticky = !!$('.stickyIcon', info); this.thread.isSticky = !!$('.stickyIcon', info);
this.thread.isClosed = !!$('.closedIcon', info); this.thread.isClosed = !!$('.closedIcon', info);
root.parentElement.dataset.fullID = this.fullID;
} }
this.info = {}; this.info = {};
if (subject = $('.subject', info)) { if (subject = $('.subject', info)) {
@ -6068,7 +6067,7 @@
return "/" + thread.board + "/ - " + excerpt; return "/" + thread.board + "/ - " + excerpt;
}, },
threadFromRoot: function(root) { threadFromRoot: function(root) {
return g.threads[root.dataset.fullID]; return g.threads[$('.opcontainer', root).dataset.fullID];
}, },
threadFromNode: function(node) { threadFromNode: function(node) {
return Get.threadFromRoot($.x('ancestor::div[@class="thread"]', node)); return Get.threadFromRoot($.x('ancestor::div[@class="thread"]', node));

2
src/General/Get.coffee
View File

@ -8,7 +8,7 @@ Get =
excerpt = "#{excerpt[...67]}..." excerpt = "#{excerpt[...67]}..."
"/#{thread.board}/ - #{excerpt}" "/#{thread.board}/ - #{excerpt}"
threadFromRoot: (root) -> threadFromRoot: (root) ->
g.threads[root.dataset.fullID] g.threads[$('.opcontainer', root).dataset.fullID]
threadFromNode: (node) -> threadFromNode: (node) ->
Get.threadFromRoot $.x 'ancestor::div[@class="thread"]', node Get.threadFromRoot $.x 'ancestor::div[@class="thread"]', node
postFromRoot: (root) -> postFromRoot: (root) ->

1553
src/General/css/style.css
View File

File diff suppressed because it is too large Load Diff

1
src/General/lib/post.class
View File

@ -23,7 +23,6 @@ class Post
@thread.OP = @ @thread.OP = @
@thread.isSticky = !!$ '.stickyIcon', info @thread.isSticky = !!$ '.stickyIcon', info
@thread.isClosed = !!$ '.closedIcon', info @thread.isClosed = !!$ '.closedIcon', info
root.parentElement.dataset.fullID = @fullID
@info = {} @info = {}
if subject = $ '.subject', info if subject = $ '.subject', info