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

Merge branch 'v3'

Browse Source 
Conflicts:
	LICENSE
	builds/4chan-X.js
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2013-05-09 01:19:45 -07:00
commit b1df7430cf
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,5 +1,6 @@
zixaphir zixaphir
- More mascot and theme editor fixes. - More mascot and theme editor fixes.
- Fix stubs in reply hiding menu not following stubs config.
### 2.0.1 - 2013-05-08 ### 2.0.1 - 2013-05-08
seaweed seaweed

6
builds/appchan-x.js
View File

@ -5140,10 +5140,10 @@
innerHTML: '<input type=checkbox name=thisPost checked> This post' innerHTML: '<input type=checkbox name=thisPost checked> This post'
}); });
replies = $.el('label', { replies = $.el('label', {
innerHTML: "<input type=checkbox name=replies checked=" + Conf['Recursive Hiding'] + "> Hide replies" innerHTML: "<input type=checkbox name=replies " + (Conf['Recursive Hiding'] ? 'checked' : '') + "> Hide replies"
}); });
makeStub = $.el('label', { makeStub = $.el('label', {
innerHTML: "<input type=checkbox name=makeStub checked=" + Conf['Stubs'] + "> Make stub" innerHTML: "<input type=checkbox name=makeStub " + (Conf['Stubs'] ? 'checked' : '') + "> Make stub"
}); });
$.event('AddMenuEntry', { $.event('AddMenuEntry', {
type: 'post', type: 'post',
@ -5529,7 +5529,7 @@
}); });
$.on(apply, 'click', ThreadHiding.menu.hide); $.on(apply, 'click', ThreadHiding.menu.hide);
makeStub = $.el('label', { makeStub = $.el('label', {
innerHTML: "<input type=checkbox checked=" + Conf['Stubs'] + "> Make stub" innerHTML: "<input type=checkbox " + (Conf['Stubs'] ? 'checked' : '') + "> Make stub"
}); });
return $.event('AddMenuEntry', { return $.event('AddMenuEntry', {
type: 'post', type: 'post',

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

@ -5136,10 +5136,10 @@
innerHTML: '<input type=checkbox name=thisPost checked> This post' innerHTML: '<input type=checkbox name=thisPost checked> This post'
}); });
replies = $.el('label', { replies = $.el('label', {
innerHTML: "<input type=checkbox name=replies checked=" + Conf['Recursive Hiding'] + "> Hide replies" innerHTML: "<input type=checkbox name=replies " + (Conf['Recursive Hiding'] ? 'checked' : '') + "> Hide replies"
}); });
makeStub = $.el('label', { makeStub = $.el('label', {
innerHTML: "<input type=checkbox name=makeStub checked=" + Conf['Stubs'] + "> Make stub" innerHTML: "<input type=checkbox name=makeStub " + (Conf['Stubs'] ? 'checked' : '') + "> Make stub"
}); });
$.event('AddMenuEntry', { $.event('AddMenuEntry', {
type: 'post', type: 'post',
@ -5525,7 +5525,7 @@
}); });
$.on(apply, 'click', ThreadHiding.menu.hide); $.on(apply, 'click', ThreadHiding.menu.hide);
makeStub = $.el('label', { makeStub = $.el('label', {
innerHTML: "<input type=checkbox checked=" + Conf['Stubs'] + "> Make stub" innerHTML: "<input type=checkbox " + (Conf['Stubs'] ? 'checked' : '') + "> Make stub"
}); });
return $.event('AddMenuEntry', { return $.event('AddMenuEntry', {
type: 'post', type: 'post',

6
builds/crx/script.js
View File

@ -5138,10 +5138,10 @@
innerHTML: '<input type=checkbox name=thisPost checked> This post' innerHTML: '<input type=checkbox name=thisPost checked> This post'
}); });
replies = $.el('label', { replies = $.el('label', {
innerHTML: "<input type=checkbox name=replies checked=" + Conf['Recursive Hiding'] + "> Hide replies" innerHTML: "<input type=checkbox name=replies " + (Conf['Recursive Hiding'] ? 'checked' : '') + "> Hide replies"
}); });
makeStub = $.el('label', { makeStub = $.el('label', {
innerHTML: "<input type=checkbox name=makeStub checked=" + Conf['Stubs'] + "> Make stub" innerHTML: "<input type=checkbox name=makeStub " + (Conf['Stubs'] ? 'checked' : '') + "> Make stub"
}); });
$.event('AddMenuEntry', { $.event('AddMenuEntry', {
type: 'post', type: 'post',
@ -5527,7 +5527,7 @@
}); });
$.on(apply, 'click', ThreadHiding.menu.hide); $.on(apply, 'click', ThreadHiding.menu.hide);
makeStub = $.el('label', { makeStub = $.el('label', {
innerHTML: "<input type=checkbox checked=" + Conf['Stubs'] + "> Make stub" innerHTML: "<input type=checkbox " + (Conf['Stubs'] ? 'checked' : '') + "> Make stub"
}); });
return $.event('AddMenuEntry', { return $.event('AddMenuEntry', {
type: 'post', type: 'post',

4
src/Filtering/PostHiding.coffee
View File

@ -35,9 +35,9 @@ PostHiding =
thisPost = $.el 'label', thisPost = $.el 'label',
innerHTML: '<input type=checkbox name=thisPost checked> This post' innerHTML: '<input type=checkbox name=thisPost checked> This post'
replies = $.el 'label', replies = $.el 'label',
innerHTML: "<input type=checkbox name=replies checked=#{Conf['Recursive Hiding']}> Hide replies" innerHTML: "<input type=checkbox name=replies #{if Conf['Recursive Hiding'] then 'checked' else ''}> Hide replies"
makeStub = $.el 'label', makeStub = $.el 'label',
innerHTML: "<input type=checkbox name=makeStub checked=#{Conf['Stubs']}> Make stub" innerHTML: "<input type=checkbox name=makeStub #{if Conf['Stubs'] then 'checked' else ''}> Make stub"
$.event 'AddMenuEntry', $.event 'AddMenuEntry',
type: 'post' type: 'post'

2
src/Filtering/ThreadHiding.coffee
View File

@ -69,7 +69,7 @@ ThreadHiding =
$.on apply, 'click', ThreadHiding.menu.hide $.on apply, 'click', ThreadHiding.menu.hide
makeStub = $.el 'label', makeStub = $.el 'label',
innerHTML: "<input type=checkbox checked=#{Conf['Stubs']}> Make stub" innerHTML: "<input type=checkbox #{if Conf['Stubs'] then 'checked' else ''}> Make stub"
$.event 'AddMenuEntry', $.event 'AddMenuEntry',
type: 'post' type: 'post'