Merge branch 'v3'

Conflicts:
	LICENSE
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	src/General/Header.coffee

LICENSE

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

builds/appchan-x.meta.js

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

builds/crx/manifest.json

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

package.json

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

src/Filtering/PostHiding.coffee

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

src/General/Header.coffee

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