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

Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/lib/post.class

CHANGELOG.md

@@ -1,8 +1,4 @@
-
 **MayhemYDG**:
-- Fix 4chan X breaking in threads following a 4chan markup change.
-- Minor cooldown fix:
- - You cannot post an image reply immediately after a non-image reply anymore.
 - **New option**: `Auto-hide header on scroll`.
 - Added support for `4cdn.org`.
 - Index navigation improvements:
@@ -47,6 +43,16 @@
 **Zixaphir**:
 - FappeTyme and WerkTyme now persist across sessions.
 
+### v1.2.44 
+*2013-12-06*
+
+**MayhemYDG**:
+- Cooldown fix (You can no longer post an image reply immediately after a text reply)
+- Fix for 4chan markup change that caused a lot of errors
+
+**seaweedchan**:
+- Fix catalog links option
+
 ### v1.2.43 
 *2013-11-10*
 

LICENSE

@@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.2.43 - 2013-12-18
+* 4chan X - Version 1.2.44 - 2013-12-18
 *
 * 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.43
+// @version      1.2.44
 // @minGMVer     1.12
 // @minFFVer     22
 // @namespace    4chan-X

builds/crx/manifest.json

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

latest.js

@@ -1 +1 @@
-postMessage({version:'1.2.43'},'*')
+postMessage({version:'1.2.44'},'*')

package.json

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

src/General/css/style.css

@@ -67,6 +67,9 @@ a {
   display: block !important;
   overflow: visible !important;
 }
+.reply > .file > .fileText {
+  margin: 0 20px;
+}
 [hidden] {
   display: none !important;
 }

src/Miscellaneous/CatalogLinks.coffee

@@ -28,8 +28,8 @@ CatalogLinks =
   set: (useCatalog) ->
     path = if useCatalog then 'catalog' else ''
     for a in $$ """
-      #board-list a[href*="boards.4chan.org"]:not(.catalog),
-      #boardNavDesktopFoot a[href*="boards.4chan.org"]
+      #board-list a:not(.catalog),
+      #boardNavDesktopFoot a
     """
       board = a.pathname.split('/')[1]
       continue if ['f', 'status', '4chan'].contains(board) or !board
@@ -37,7 +37,7 @@ CatalogLinks =
         a.href = if useCatalog
           CatalogLinks.external board
         else
-          "//boards.4chan.org/#{board}/"
+          "/#{board}/"
       else
         a.pathname = "/#{board}/#{path}"
     @title = "Turn catalog links #{if useCatalog then 'off' else 'on'}."
@@ -49,5 +49,5 @@ CatalogLinks =
       else if ['d', 'e', 'gif', 'h', 'hr', 'hc', 'r9k', 's', 'pol', 'soc', 'u', 'i', 'ic', 'hm', 'r', 'w', 'wg', 'wsg', 't', 'y'].contains board
         "http://4index.gropes.us/#{board}"
       else
-        "//boards.4chan.org/#{board}/catalog"
+        "/#{board}/catalog"
     )