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

Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3

Browse Source
This commit is contained in:
Zixaphir 2013-04-26 12:40:23 -07:00
commit 2f83193487
13 changed files with 43 additions and 4491 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -1,4 +1,11 @@
mayhemydg: seaweedchan:
- Fix emoji and favicon previews not updating on change.
### 1.1.1 - 2013-04-26
zixaphir:
- Fix script on Opera
MayhemYDG:
- Minor fixes. - Minor fixes.
- Chrome only: Due to technical limitations, Filter lists and Custom CSS will not by synchronized across devices anymore. - Chrome only: Due to technical limitations, Filter lists and Custom CSS will not by synchronized across devices anymore.

2
Gruntfile.coffee
View File

@ -202,6 +202,6 @@ module.exports = (grunt) ->
# i is the number of #s for markdown. # i is the number of #s for markdown.
version = [] version = []
version.length = +i + 1 version.length = +i + 1
version = version.join('#') + ' ' + pkg.version + ' *(' + grunt.template.today('yyyy-mm-dd') + ')*' version = version.join('#') + ' ' + pkg.version + ' - ' + grunt.template.today('yyyy-mm-dd')
grunt.file.write 'CHANGELOG.md', version + '\n' + grunt.file.read('CHANGELOG.md') grunt.file.write 'CHANGELOG.md', version + '\n' + grunt.file.read('CHANGELOG.md')
grunt.log.ok 'Changelog updated for v' + pkg.version + '.' grunt.log.ok 'Changelog updated for v' + pkg.version + '.'

6
LICENSE
View File

@ -1,9 +1,11 @@
/* /*
* 4chan X - Version 1.1.0 - 2013-04-26 * 4chan X - Version 1.1.1 - 2013-04-26
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/seaweedchan/4chan-x/blob/master/LICENSE * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
* *
* Appchan X Copyright © 2013-2013 Zixaphir <zixaphirmoxphar@gmail.com>
* http://zixaphir.github.io/appchan-x/
* 4chan x Copyright © 2009-2011 James Campos <james.r.campos@gmail.com> * 4chan x Copyright © 2009-2011 James Campos <james.r.campos@gmail.com>
* https://github.com/aeosynth/4chan-x * https://github.com/aeosynth/4chan-x
* 4chan x Copyright © 2012-2013 Nicolas Stepien <stepien.nicolas@gmail.com> * 4chan x Copyright © 2012-2013 Nicolas Stepien <stepien.nicolas@gmail.com>
@ -12,6 +14,8 @@
* http://seaweedchan.github.io/4chan-x/ * http://seaweedchan.github.io/4chan-x/
* 4chan x Copyright © 2012-2013 ihavenoface * 4chan x Copyright © 2012-2013 ihavenoface
* http://ihavenoface.github.io/4chan-x/ * http://ihavenoface.github.io/4chan-x/
* 4chan SS Copyright © 2011-2013 Ahodesuka
* https://github.com/ahodesuka/4chan-Style-Script/
* *
* Permission is hereby granted, free of charge, to any person * Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation * obtaining a copy of this software and associated documentation

13
builds/4chan-X.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.1.0 // @version 1.1.1
// @namespace 4chan-X // @namespace 4chan-X
// @description Cross-browser userscript for maximum lurking on 4chan. // @description Cross-browser userscript for maximum lurking on 4chan.
// @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE // @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
@ -18,11 +18,13 @@
// @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC
// ==/UserScript== // ==/UserScript==
/* /*
* 4chan X - Version 1.1.0 - 2013-04-26 * 4chan X - Version 1.1.1 - 2013-04-26
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/seaweedchan/4chan-x/blob/master/LICENSE * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
* *
* Appchan X Copyright © 2013-2013 Zixaphir <zixaphirmoxphar@gmail.com>
* http://zixaphir.github.io/appchan-x/
* 4chan x Copyright © 2009-2011 James Campos <james.r.campos@gmail.com> * 4chan x Copyright © 2009-2011 James Campos <james.r.campos@gmail.com>
* https://github.com/aeosynth/4chan-x * https://github.com/aeosynth/4chan-x
* 4chan x Copyright © 2012-2013 Nicolas Stepien <stepien.nicolas@gmail.com> * 4chan x Copyright © 2012-2013 Nicolas Stepien <stepien.nicolas@gmail.com>
@ -31,6 +33,8 @@
* http://seaweedchan.github.io/4chan-x/ * http://seaweedchan.github.io/4chan-x/
* 4chan x Copyright © 2012-2013 ihavenoface * 4chan x Copyright © 2012-2013 ihavenoface
* http://ihavenoface.github.io/4chan-x/ * http://ihavenoface.github.io/4chan-x/
* 4chan SS Copyright © 2011-2013 Ahodesuka
* https://github.com/ahodesuka/4chan-Style-Script/
* *
* Permission is hereby granted, free of charge, to any person * Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation * obtaining a copy of this software and associated documentation
@ -297,7 +301,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.1.0', VERSION: '1.1.1',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {}, boards: {},
threads: {}, threads: {},
@ -5111,7 +5115,8 @@
setBarVisibility: function(hide) { setBarVisibility: function(hide) {
Header.headerToggler.checked = hide; Header.headerToggler.checked = hide;
$.event('CloseMenu'); $.event('CloseMenu');
return (hide ? $.addClass : $.rmClass)(Header.bar, 'autohide'); (hide ? $.addClass : $.rmClass)(Header.bar, 'autohide');
return (hide ? $.addClass : $.rmClass)(doc, 'autohide');
}, },
toggleBarVisibility: function(e) { toggleBarVisibility: function(e) {
var hide, message; var hide, message;

2
builds/4chan-X.meta.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.1.0 // @version 1.1.1
// @namespace 4chan-X // @namespace 4chan-X
// @description Cross-browser userscript for maximum lurking on 4chan. // @description Cross-browser userscript for maximum lurking on 4chan.
// @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE // @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE

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

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.1.0 // @version 1.1.1
// @namespace 4chan-X // @namespace 4chan-X
// @description Cross-browser userscript for maximum lurking on 4chan. // @description Cross-browser userscript for maximum lurking on 4chan.
// @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE // @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
@ -18,11 +18,13 @@
// @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC
// ==/UserScript== // ==/UserScript==
/* /*
* 4chan X - Version 1.1.0 - 2013-04-26 * 4chan X - Version 1.1.1 - 2013-04-26
* *
* Licensed under the MIT license. * Licensed under the MIT license.
* https://github.com/seaweedchan/4chan-x/blob/master/LICENSE * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE
* *
* Appchan X Copyright © 2013-2013 Zixaphir <zixaphirmoxphar@gmail.com>
* http://zixaphir.github.io/appchan-x/
* 4chan x Copyright © 2009-2011 James Campos <james.r.campos@gmail.com> * 4chan x Copyright © 2009-2011 James Campos <james.r.campos@gmail.com>
* https://github.com/aeosynth/4chan-x * https://github.com/aeosynth/4chan-x
* 4chan x Copyright © 2012-2013 Nicolas Stepien <stepien.nicolas@gmail.com> * 4chan x Copyright © 2012-2013 Nicolas Stepien <stepien.nicolas@gmail.com>
@ -31,6 +33,8 @@
* http://seaweedchan.github.io/4chan-x/ * http://seaweedchan.github.io/4chan-x/
* 4chan x Copyright © 2012-2013 ihavenoface * 4chan x Copyright © 2012-2013 ihavenoface
* http://ihavenoface.github.io/4chan-x/ * http://ihavenoface.github.io/4chan-x/
* 4chan SS Copyright © 2011-2013 Ahodesuka
* https://github.com/ahodesuka/4chan-Style-Script/
* *
* Permission is hereby granted, free of charge, to any person * Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation * obtaining a copy of this software and associated documentation
@ -294,7 +298,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.1.0', VERSION: '1.1.1',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {}, boards: {},
threads: {}, threads: {},
@ -5107,7 +5111,8 @@
setBarVisibility: function(hide) { setBarVisibility: function(hide) {
Header.headerToggler.checked = hide; Header.headerToggler.checked = hide;
$.event('CloseMenu'); $.event('CloseMenu');
return (hide ? $.addClass : $.rmClass)(Header.bar, 'autohide'); (hide ? $.addClass : $.rmClass)(Header.bar, 'autohide');
return (hide ? $.addClass : $.rmClass)(doc, 'autohide');
}, },
toggleBarVisibility: function(e) { toggleBarVisibility: function(e) {
var hide, message; var hide, message;

2
builds/crx/manifest.json
View File

@ -1,6 +1,6 @@
{ {
"name": "4chan X", "name": "4chan X",
"version": "1.1.0", "version": "1.1.1",
"manifest_version": 2, "manifest_version": 2,
"description": "Cross-browser userscript for maximum lurking on 4chan.", "description": "Cross-browser userscript for maximum lurking on 4chan.",
"icons": { "icons": {

5
builds/crx/script.js
View File

@ -190,7 +190,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.1.0', VERSION: '1.1.1',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {}, boards: {},
threads: {}, threads: {},
@ -5024,7 +5024,8 @@
setBarVisibility: function(hide) { setBarVisibility: function(hide) {
Header.headerToggler.checked = hide; Header.headerToggler.checked = hide;
$.event('CloseMenu'); $.event('CloseMenu');
return (hide ? $.addClass : $.rmClass)(Header.bar, 'autohide'); (hide ? $.addClass : $.rmClass)(Header.bar, 'autohide');
return (hide ? $.addClass : $.rmClass)(doc, 'autohide');
}, },
toggleBarVisibility: function(e) { toggleBarVisibility: function(e) {
var hide, message; var hide, message;

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "4chan-X", "name": "4chan-X",
"version": "1.1.0", "version": "1.1.1",
"description": "Cross-browser userscript for maximum lurking on 4chan.", "description": "Cross-browser userscript for maximum lurking on 4chan.",
"meta": { "meta": {
"name": "4chan X", "name": "4chan X",

4475
src/features.coffee
View File

File diff suppressed because it is too large Load Diff

1
src/features/misc/header.coffee
View File

@ -207,6 +207,7 @@ Header =
Header.headerToggler.checked = hide Header.headerToggler.checked = hide
$.event 'CloseMenu' $.event 'CloseMenu'
(if hide then $.addClass else $.rmClass) Header.bar, 'autohide' (if hide then $.addClass else $.rmClass) Header.bar, 'autohide'
(if hide then $.addClass else $.rmClass) doc, 'autohide'
toggleBarVisibility: (e) -> toggleBarVisibility: (e) ->
return if e.type is 'mousedown' and e.button isnt 0 # not LMB return if e.type is 'mousedown' and e.button isnt 0 # not LMB

BIN
src/img/changelog/3.2.0/0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 13 KiB

4
src/meta/banner.js
View File

@ -4,6 +4,8 @@
* Licensed under the MIT license. * Licensed under the MIT license.
* <%= meta.repo %>blob/master/LICENSE * <%= meta.repo %>blob/master/LICENSE
* *
* Appchan X Copyright © 2013-2013 Zixaphir <zixaphirmoxphar@gmail.com>
* http://zixaphir.github.io/appchan-x/
* 4chan x Copyright © 2009-2011 James Campos <james.r.campos@gmail.com> * 4chan x Copyright © 2009-2011 James Campos <james.r.campos@gmail.com>
* https://github.com/aeosynth/4chan-x * https://github.com/aeosynth/4chan-x
* 4chan x Copyright © 2012-<%= grunt.template.today('yyyy') %> Nicolas Stepien <stepien.nicolas@gmail.com> * 4chan x Copyright © 2012-<%= grunt.template.today('yyyy') %> Nicolas Stepien <stepien.nicolas@gmail.com>
@ -12,6 +14,8 @@
* http://seaweedchan.github.io/4chan-x/ * http://seaweedchan.github.io/4chan-x/
* 4chan x Copyright © 2012-<%= grunt.template.today('yyyy') %> ihavenoface * 4chan x Copyright © 2012-<%= grunt.template.today('yyyy') %> ihavenoface
* http://ihavenoface.github.io/4chan-x/ * http://ihavenoface.github.io/4chan-x/
* 4chan SS Copyright © 2011-2013 Ahodesuka
* https://github.com/ahodesuka/4chan-Style-Script/
* *
* Permission is hereby granted, free of charge, to any person * Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation * obtaining a copy of this software and associated documentation