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.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	src/General/Header.coffee
This commit is contained in:
Zixaphir 2013-12-27 15:35:34 -07:00
commit dcd6547169
8 changed files with 40 additions and 1132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -1,5 +1,5 @@
/* /*
* appchan x - Version 2.7.3 - 2013-12-26 * appchan x - Version 2.7.3 - 2013-12-27
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/zixaphir/appchan-x/blob/master/LICENSE * https://github.com/zixaphir/appchan-x/blob/master/LICENSE

4
builds/appchan-x.meta.js
View File

@ -1,8 +1,8 @@
// ==UserScript== // ==UserScript==
// @name appchan x // @name appchan x
// @version 2.7.3 // @version 2.7.3
// @minGMVer 1.12 // @minGMVer 1.13
// @minFFVer 22 // @minFFVer 26
// @namespace zixaphir // @namespace zixaphir
// @description The most comprehensive 4chan userscript. // @description The most comprehensive 4chan userscript.
// @license MIT; https://github.com/zixaphir/appchan-x/blob/master/LICENSE // @license MIT; https://github.com/zixaphir/appchan-x/blob/master/LICENSE

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

File diff suppressed because one or more lines are too long

2
builds/crx/manifest.json
View File

@ -15,7 +15,7 @@
"run_at": "document_start" "run_at": "document_start"
}], }],
"homepage_url": "http://zixaphir.github.com/appchan-x/", "homepage_url": "http://zixaphir.github.com/appchan-x/",
"minimum_chrome_version": "29", "minimum_chrome_version": "31",
"permissions": [ "permissions": [
"storage" "storage"
] ]

557
builds/crx/script.js
View File

File diff suppressed because one or more lines are too long

6
package.json
View File

@ -20,9 +20,9 @@
"userjs": "appchan-x.user.js" "userjs": "appchan-x.user.js"
}, },
"min": { "min": {
"chrome": "29", "chrome": "31",
"firefox": "22", "firefox": "26",
"greasemonkey": "1.12" "greasemonkey": "1.13"
} }
}, },
"devDependencies": { "devDependencies": {

18
src/Filtering/PostHiding.coffee
View File

@ -51,7 +51,15 @@ PostHiding =
return false return false
PostHiding.menu.post = post PostHiding.menu.post = post
true true
subEntries: [{el: apply}, {el: thisPost}, {el: replies}, {el: makeStub}] subEntries: [
el: apply
,
el: thisPost
,
el: replies
,
el: makeStub
]
# Show # Show
div = $.el 'div', div = $.el 'div',
@ -85,7 +93,13 @@ PostHiding =
thisPost.firstChild.checked = post.isHidden thisPost.firstChild.checked = post.isHidden
replies.firstChild.checked = if data?.hideRecursively? then data.hideRecursively else Conf['Recursive Hiding'] replies.firstChild.checked = if data?.hideRecursively? then data.hideRecursively else Conf['Recursive Hiding']
true true
subEntries: [{el: apply}, {el: thisPost}, {el: replies}] subEntries: [
el: apply
,
el: thisPost
,
el: replies
]
# Extra Entry to hide stubs on hidden posts. # Extra Entry to hide stubs on hidden posts.
$.event 'AddMenuEntry', $.event 'AddMenuEntry',

17
src/General/Header.coffee
View File

@ -52,12 +52,17 @@ Header =
textContent: 'Header' textContent: 'Header'
order: 107 order: 107
subEntries: [ subEntries: [
{el: barFixedToggler} el: barFixedToggler
{el: headerToggler} ,
{el: scrollHeaderToggler} el: headerToggler
{el: barPositionToggler} ,
{el: customNavToggler} el: scrollHeaderToggler
{el: editCustomNav} ,
el: barPositionToggler
,
el: customNavToggler
,
el: editCustomNav
] ]
$.on window, 'load hashchange', Header.hashScroll $.on window, 'load hashchange', Header.hashScroll