Merge branch 'v3' into json

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

CHANGELOG.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 **MayhemYDG**:
 - **New option**: `Auto-hide header on scroll`.
 - Added support for `4cdn.org`.
@@ -42,6 +43,18 @@
 
 **Zixaphir**:
 - FappeTyme and WerkTyme now persist across sessions.
+=======
+### v1.2.45 
+*2014-01-07*
+
+**seaweedchan**:
+- Remove moot's plea to remove ad-blocker
+- Hopefully fix NSFW themes and 404 image redirecting
+- Update archive list
+
+**Zixaphir**:
+- Fix optional increase for thread updater
+>>>>>>> 08ae1daee8d4a2dfa272b00a62f78aa56092dfd4
 
 ### v1.2.44 
 *2013-12-06*

LICENSE

@@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.2.44 - 2014-01-07
+* 4chan X - Version 1.2.45 - 2014-01-07
 *
 * 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.44
+// @version      1.2.45
 // @minGMVer     1.13
 // @minFFVer     26
 // @namespace    4chan-X

builds/crx/manifest.json

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

latest.js

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "4chan-X",
-  "version": "1.2.44",
+  "version": "1.2.45",
   "description": "Cross-browser userscript for maximum lurking on 4chan.",
   "meta": {
     "name": "4chan X",
@@ -13,6 +13,7 @@
       "*://sys.4chan.org/*",
       "*://a.4cdn.org/*",
       "*://i.4cdn.org/*"
+
     ],
     "files": {
       "metajs": "4chan-X.meta.js",

src/General/Main.coffee

@@ -35,8 +35,6 @@ Main =
       Main.initFeatures()
 
     $.on d, '4chanMainInit', Main.initStyle
-    $.asap (-> d.head and $('link[rel="shortcut icon"]', d.head) or d.readyState isnt 'loading'),
-      Main.initStyle
 
   initFeatures: ->
     switch location.hostname

src/General/css/style.css

@@ -73,6 +73,9 @@ a {
 [hidden] {
   display: none !important;
 }
+div.center:not(.ad-cnt) {
+  display: none !important;
+}
 
 /* fixed, z-index */
 #overlay,

src/Monitoring/ThreadUpdater.coffee

@@ -28,7 +28,7 @@ ThreadUpdater =
     $.on @timer,  'click', @update
     $.on @status, 'click', @update
 
-    @subEntries = []
+    subEntries = []
     for name, conf of Config.updater.checkbox
       checked = if Conf[name] then 'checked' else ''
       el = $.el 'label',