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
	src/General/Main.coffee
This commit is contained in:
Zixaphir 2014-05-03 06:39:09 -07:00
commit 7514ff41d4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18342,7 +18342,7 @@
return window.open('//sys.4chan.org/auth', 'This will steal your data.', 'left=0,top=0,width=500,height=255,toolbar=0,resizable=0'); return window.open('//sys.4chan.org/auth', 'This will steal your data.', 'left=0,top=0,width=500,height=255,toolbar=0,resizable=0');
}); });
$.before(styleSelector.previousSibling, [$.tn('['), passLink, $.tn(']\u00A0\u00A0')]); $.before(styleSelector.previousSibling, [$.tn('['), passLink, $.tn(']\u00A0\u00A0')]);
$('link[href*="mobile"', d.head).disabled = true; $('link[href*="mobile"]', d.head).disabled = true;
} }
if (!Conf['JSON Navigation'] || g.VIEW === 'thread') { if (!Conf['JSON Navigation'] || g.VIEW === 'thread') {
Main.initThread(); Main.initThread();

2
builds/crx/script.js
View File

@ -18359,7 +18359,7 @@
return window.open('//sys.4chan.org/auth', 'This will steal your data.', 'left=0,top=0,width=500,height=255,toolbar=0,resizable=0'); return window.open('//sys.4chan.org/auth', 'This will steal your data.', 'left=0,top=0,width=500,height=255,toolbar=0,resizable=0');
}); });
$.before(styleSelector.previousSibling, [$.tn('['), passLink, $.tn(']\u00A0\u00A0')]); $.before(styleSelector.previousSibling, [$.tn('['), passLink, $.tn(']\u00A0\u00A0')]);
$('link[href*="mobile"', d.head).disabled = true; $('link[href*="mobile"]', d.head).disabled = true;
} }
if (!Conf['JSON Navigation'] || g.VIEW === 'thread') { if (!Conf['JSON Navigation'] || g.VIEW === 'thread') {
Main.initThread(); Main.initThread();

2
src/General/Main.coffee
View File

@ -204,7 +204,7 @@ Main =
'left=0,top=0,width=500,height=255,toolbar=0,resizable=0' 'left=0,top=0,width=500,height=255,toolbar=0,resizable=0'
$.before styleSelector.previousSibling, [$.tn '['; passLink, $.tn ']\u00A0\u00A0'] $.before styleSelector.previousSibling, [$.tn '['; passLink, $.tn ']\u00A0\u00A0']
# Completely disable the mobile layout # Completely disable the mobile layout
$('link[href*="mobile"', d.head).disabled = true $('link[href*="mobile"]', d.head).disabled = true
# Parse HTML or skip it and start building from JSON. # Parse HTML or skip it and start building from JSON.
if !Conf['JSON Navigation'] or g.VIEW is 'thread' if !Conf['JSON Navigation'] or g.VIEW is 'thread'