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 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2013-08-15 19:52:10 -07:00
commit 963991ae84
10 changed files with 870 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,3 +1,9 @@
### v1.2.29
*2013-08-14*
**Zixaphir**:
- Fix issue that caused 4chan X to show settings after every page load
### v1.2.28 ### v1.2.28
*2013-08-14* *2013-08-14*

2
LICENSE
View File

@ -1,5 +1,5 @@
/* /*
* 4chan X - Version 1.2.28 - 2013-08-15 * 4chan X - Version 1.2.29 - 2013-08-15
* *
* 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

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

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.2.28 // @version 1.2.29
// @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

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

File diff suppressed because one or more lines are too long

2
builds/crx/manifest.json
View File

@ -1,6 +1,6 @@
{ {
"name": "4chan X", "name": "4chan X",
"version": "1.2.28", "version": "1.2.29",
"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": {

430
builds/crx/script.js
View File

File diff suppressed because one or more lines are too long

2
latest.js
View File

@ -1 +1 @@
postMessage({version:'1.2.28'},'*') postMessage({version:'1.2.29'},'*')

2
package.json
View File

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

2
src/Miscellaneous/ColorUserIDs.coffee
View File

@ -1,6 +1,6 @@
IDColor = IDColor =
init: -> init: ->
return if g.VIEW is 'catalog' or !Conf['Color user IDs'] return if g.VIEW is 'catalog' or !Conf['Color User IDs']
Post::callbacks.push Post::callbacks.push
name: 'Color User IDs' name: 'Color User IDs'

8
src/Posting/QuickReply.coffee
View File

@ -443,7 +443,13 @@ QR =
QR.nodes.fileInput.click() QR.nodes.fileInput.click()
fileInput: (files) -> fileInput: (files) ->
if files instanceof Event # file input try
if files instanceof Event # file input
check = true
catch err
if @ instanceof Element # file input
check = true
if check
files = [@files...] files = [@files...]
QR.nodes.fileInput.value = null # Don't hold the files from being modified on windows QR.nodes.fileInput.value = null # Don't hold the files from being modified on windows
{length} = files {length} = files