From 66e1e23e6a80d478e45ba47daf698b0650f6bc66 Mon Sep 17 00:00:00 2001
From: Kabir Sala <spittiepie@gmail.com>
Date: Thu, 27 Feb 2014 16:37:18 +0100
Subject: [PATCH] Partially fix #19

---
 LICENSE                     | 2 +-
 builds/4chan-X.user.js      | 7 +++----
 builds/crx/script.js        | 7 +++----
 src/General/Index.coffee    | 2 +-
 src/General/Navigate.coffee | 2 --
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/LICENSE b/LICENSE
index ad138a2dd..b29bc0147 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.4.0 - 2014-02-25
+* 4chan X - Version 1.4.0 - 2014-02-27
 *
 * Licensed under the MIT license.
 * https://github.com/Spittie/4chan-x/blob/master/LICENSE
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index b379897a5..cfcde66b5 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -24,7 +24,7 @@
 // ==/UserScript==
 
 /*
-* 4chan X - Version 1.4.0 - 2014-02-25
+* 4chan X - Version 1.4.0 - 2014-02-27
 *
 * Licensed under the MIT license.
 * https://github.com/Spittie/4chan-x/blob/master/LICENSE
@@ -2540,7 +2540,7 @@
       return Math.max(0, Index.getPagesNum() - 1);
     },
     togglePagelist: function() {
-      return Index.pagelist.hidden = Conf['Index Mode'] === 'all pages';
+      return Index.pagelist.hidden = Conf['Index Mode'] !== 'paged';
     },
     buildPagelist: function() {
       var a, i, maxPageNum, nodes, pagesRoot, _i;
@@ -12183,8 +12183,7 @@
         return;
       }
       $.ready(function() {
-        $.on(window, 'popstate', Navigate.popstate);
-        return $.id('catalog').href = $.id('cataloglink').href = "//boards.4chan.org/" + g.BOARD + "/catalog";
+        return $.on(window, 'popstate', Navigate.popstate);
       });
       this.title = function() {};
       Thread.callbacks.push({
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 510ecffa6..b87014ea9 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -1,6 +1,6 @@
 // Generated by CoffeeScript
 /*
-* 4chan X - Version 1.4.0 - 2014-02-25
+* 4chan X - Version 1.4.0 - 2014-02-27
 *
 * Licensed under the MIT license.
 * https://github.com/Spittie/4chan-x/blob/master/LICENSE
@@ -2581,7 +2581,7 @@
       return Math.max(0, Index.getPagesNum() - 1);
     },
     togglePagelist: function() {
-      return Index.pagelist.hidden = Conf['Index Mode'] === 'all pages';
+      return Index.pagelist.hidden = Conf['Index Mode'] !== 'paged';
     },
     buildPagelist: function() {
       var a, i, maxPageNum, nodes, pagesRoot, _i;
@@ -12186,8 +12186,7 @@
         return;
       }
       $.ready(function() {
-        $.on(window, 'popstate', Navigate.popstate);
-        return $.id('catalog').href = $.id('cataloglink').href = "//boards.4chan.org/" + g.BOARD + "/catalog";
+        return $.on(window, 'popstate', Navigate.popstate);
       });
       this.title = function() {};
       Thread.callbacks.push({
diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index 3d1a95a48..1fc908b24 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -186,7 +186,7 @@ Index =
   getMaxPageNum: ->
     Math.max 0, Index.getPagesNum() - 1
   togglePagelist: ->
-    Index.pagelist.hidden = Conf['Index Mode'] is 'all pages'
+    Index.pagelist.hidden = Conf['Index Mode'] isnt 'paged'
   buildPagelist: ->
     pagesRoot = $ '.pages', Index.pagelist
     maxPageNum = Index.getMaxPageNum()
diff --git a/src/General/Navigate.coffee b/src/General/Navigate.coffee
index 56615c495..14fa10b14 100644
--- a/src/General/Navigate.coffee
+++ b/src/General/Navigate.coffee
@@ -6,8 +6,6 @@ Navigate =
     $.ready -> 
       # blink/webkit throw a popstate on page load. Not what we want.
       $.on window, 'popstate', Navigate.popstate
-      # Prevent having to update the catalog links whenever we open threads.
-      $.id('catalog').href = $.id('cataloglink').href = "//boards.4chan.org/#{g.BOARD}/catalog"
 
     @title = -> return