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

Merge Zixaphir X

Browse Source
This commit is contained in:
Jordan Bates 2013-05-09 01:53:44 -07:00
commit 3a9160d090
7 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gruntfile.coffee
View File

@ -49,6 +49,7 @@ module.exports = (grunt) ->
files:
'builds/crx/manifest.json': 'src/General/meta/manifest.json'
'builds/crx/script.js': [
'src/General/meta/botproc.js'
'src/General/meta/banner.js'
'tmp-<%= pkg.type %>/script.js'
]
@ -56,6 +57,7 @@ module.exports = (grunt) ->
userjs:
options: concatOptions
src: [
'src/General/meta/botproc.js'
'src/General/meta/metadata.js'
'src/General/meta/banner.js'
'tmp-<%= pkg.type %>/script.js'
@ -67,6 +69,7 @@ module.exports = (grunt) ->
files:
'builds/<%= pkg.name %>.meta.js': 'src/General/meta/metadata.js'
'builds/<%= pkg.name %>.user.js': [
'src/General/meta/botproc.js'
'src/General/meta/metadata.js'
'src/General/meta/banner.js'
'tmp-<%= pkg.type %>/script.js'

7
builds/4chan-X.js
View File

@ -1,3 +1,4 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
// @version 1.1.17
@ -2986,10 +2987,10 @@
innerHTML: '<input type=checkbox name=thisPost checked> This post'
});
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', {
innerHTML: "<input type=checkbox name=makeStub checked=" + Conf['Stubs'] + "> Make stub"
innerHTML: "<input type=checkbox name=makeStub " + (Conf['Stubs'] ? 'checked' : '') + "> Make stub"
});
$.event('AddMenuEntry', {
type: 'post',
@ -3407,7 +3408,7 @@
});
$.on(apply, 'click', ThreadHiding.menu.hide);
makeStub = $.el('label', {
innerHTML: "<input type=checkbox checked=" + Conf['Stubs'] + "> Make stub"
innerHTML: "<input type=checkbox " + (Conf['Stubs'] ? 'checked' : '') + "> Make stub"
});
hideStubLink = $.el('a', {
textContent: 'Hide stub',

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

@ -1,3 +1,4 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
// @version 1.1.17
@ -2982,10 +2983,10 @@
innerHTML: '<input type=checkbox name=thisPost checked> This post'
});
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', {
innerHTML: "<input type=checkbox name=makeStub checked=" + Conf['Stubs'] + "> Make stub"
innerHTML: "<input type=checkbox name=makeStub " + (Conf['Stubs'] ? 'checked' : '') + "> Make stub"
});
$.event('AddMenuEntry', {
type: 'post',
@ -3403,7 +3404,7 @@
});
$.on(apply, 'click', ThreadHiding.menu.hide);
makeStub = $.el('label', {
innerHTML: "<input type=checkbox checked=" + Conf['Stubs'] + "> Make stub"
innerHTML: "<input type=checkbox " + (Conf['Stubs'] ? 'checked' : '') + "> Make stub"
});
hideStubLink = $.el('a', {
textContent: 'Hide stub',

7
builds/crx/script.js
View File

@ -1,3 +1,4 @@
// Generated by CoffeeScript
/*
* 4chan X - Version 1.1.17 - 2013-05-09
*
@ -2985,10 +2986,10 @@
innerHTML: '<input type=checkbox name=thisPost checked> This post'
});
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', {
innerHTML: "<input type=checkbox name=makeStub checked=" + Conf['Stubs'] + "> Make stub"
innerHTML: "<input type=checkbox name=makeStub " + (Conf['Stubs'] ? 'checked' : '') + "> Make stub"
});
$.event('AddMenuEntry', {
type: 'post',
@ -3406,7 +3407,7 @@
});
$.on(apply, 'click', ThreadHiding.menu.hide);
makeStub = $.el('label', {
innerHTML: "<input type=checkbox checked=" + Conf['Stubs'] + "> Make stub"
innerHTML: "<input type=checkbox " + (Conf['Stubs'] ? 'checked' : '') + "> Make stub"
});
hideStubLink = $.el('a', {
textContent: 'Hide stub',

4
src/Filtering/PostHiding.coffee
View File

@ -35,9 +35,9 @@ PostHiding =
thisPost = $.el 'label',
innerHTML: '<input type=checkbox name=thisPost checked> This post'
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',
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',
type: 'post'

2
src/Filtering/ThreadHiding.coffee
View File

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

1
src/General/meta/botproc.js Normal file
View File

@ -0,0 +1 @@
// Generated by CoffeeScript