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

Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js

CHANGELOG.md

@@ -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 
 *2013-08-14*
 

LICENSE

@@ -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.
 * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE

builds/4chan-X.meta.js

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

builds/crx/manifest.json

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

latest.js

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

package.json

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

src/Miscellaneous/ColorUserIDs.coffee

@@ -1,6 +1,6 @@
 IDColor =
   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
       name: 'Color User IDs'

src/Posting/QuickReply.coffee

@@ -443,7 +443,13 @@ QR =
     QR.nodes.fileInput.click()
 
   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...]
       QR.nodes.fileInput.value = null # Don't hold the files from being modified on windows
     {length} = files