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

Merge branch 'v3'

Browse Source 
Conflicts:
	src/Quotelinks/QuoteYou.coffee
This commit is contained in:
Zixaphir 2013-08-09 20:33:42 -07:00
commit 70b00a1337
6 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3487,7 +3487,7 @@
textContent: 'Show thread',
href: 'javascript:;'
});
$.on(show, 'click', ThreadHiding.menu.show);
$.on(div, 'click', ThreadHiding.menu.show);
$.event('AddMenuEntry', {
type: 'post'
});
@ -4223,12 +4223,14 @@
},
cb: {
seek: function(type) {
var post, posts, result, str;
var highlight, post, posts, result, str;
if (!(Conf['Mark Quotes of You'] && Conf['Quick Reply'])) {
return;
}
$.rmClass($('.highlight'), 'highlight');
if (highlight = $('.highlight')) {
$.rmClass(highlight, 'highlight');
}
if (!QuoteYou.lastRead) {
if (!(post = QuoteYou.lastRead = $('.quotesYou'))) {
new Notification('warning', 'No posts are currently quoting you, loser.', 20);

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

File diff suppressed because one or more lines are too long

10
builds/crx/script.js
View File

File diff suppressed because one or more lines are too long

4
src/General/Globals.coffee
View File

@ -3066,7 +3066,9 @@ textarea,
#unread-line {
margin: -1px;
}
#qp { border: none !important; }
#qp {
border: none !important;
}
#unread-line {
padding: 1px;
border: 1px solid #111 !important;

2
src/General/css/themeoptions.css
View File

@ -26,7 +26,7 @@
.lit {
color: #368c72;
}
"} else {"
" else "
.prettyprint {
background-color: rgba(0,0,0,.1);
border: 1px solid rgba(0,0,0,0.5);

2
src/Quotelinks/QuoteYou.coffee
View File

@ -34,7 +34,7 @@ QuoteYou =
cb:
seek: (type) ->
return unless Conf['Mark Quotes of You']
$.rmClass $('.highlight'), 'highlight'
$.rmClass highlight, 'highlight' if highlight = $ '.highlight'
unless QuoteYou.lastRead
unless post = QuoteYou.lastRead = $ '.quotesYou'