Merge Zixaphir X

Gruntfile.coffee

@@ -49,6 +49,7 @@ module.exports = (grunt) ->
         files:
           'builds/crx/manifest.json': 'src/General/meta/manifest.json'
           'builds/crx/script.js': [
+            'src/General/meta/botproc.js'
             'src/General/meta/banner.js'
             'tmp-<%= pkg.type %>/script.js'
           ]
@@ -56,6 +57,7 @@ module.exports = (grunt) ->
       userjs:
         options: concatOptions
         src: [
+          'src/General/meta/botproc.js'
           'src/General/meta/metadata.js'
           'src/General/meta/banner.js'
           'tmp-<%= pkg.type %>/script.js'
@@ -67,6 +69,7 @@ module.exports = (grunt) ->
         files:
           'builds/<%= pkg.name %>.meta.js': 'src/General/meta/metadata.js'
           'builds/<%= pkg.name %>.user.js': [
+            'src/General/meta/botproc.js'
             'src/General/meta/metadata.js'
             'src/General/meta/banner.js'
             'tmp-<%= pkg.type %>/script.js'

builds/4chan-X.js

@@ -1,3 +1,4 @@
+// Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
 // @version      1.1.17
@@ -2986,10 +2987,10 @@
           innerHTML: '<input type=checkbox name=thisPost checked> This post'
         });
         replies = $.el('label', {
-          innerHTML: "<input type=checkbox name=replies  checked=" + Conf['Recursive Hiding'] + "> Hide replies"
+          innerHTML: "<input type=checkbox name=replies  " + (Conf['Recursive Hiding'] ? 'checked' : '') + "> Hide replies"
         });
         makeStub = $.el('label', {
-          innerHTML: "<input type=checkbox name=makeStub checked=" + Conf['Stubs'] + "> Make stub"
+          innerHTML: "<input type=checkbox name=makeStub " + (Conf['Stubs'] ? 'checked' : '') + "> Make stub"
         });
         $.event('AddMenuEntry', {
           type: 'post',
@@ -3407,7 +3408,7 @@
         });
         $.on(apply, 'click', ThreadHiding.menu.hide);
         makeStub = $.el('label', {
-          innerHTML: "<input type=checkbox checked=" + Conf['Stubs'] + "> Make stub"
+          innerHTML: "<input type=checkbox " + (Conf['Stubs'] ? 'checked' : '') + "> Make stub"
         });
         hideStubLink = $.el('a', {
           textContent: 'Hide stub',

builds/4chan-X.user.js

@@ -1,3 +1,4 @@
+// Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
 // @version      1.1.17
@@ -2982,10 +2983,10 @@
           innerHTML: '<input type=checkbox name=thisPost checked> This post'
         });
         replies = $.el('label', {
-          innerHTML: "<input type=checkbox name=replies  checked=" + Conf['Recursive Hiding'] + "> Hide replies"
+          innerHTML: "<input type=checkbox name=replies  " + (Conf['Recursive Hiding'] ? 'checked' : '') + "> Hide replies"
         });
         makeStub = $.el('label', {
-          innerHTML: "<input type=checkbox name=makeStub checked=" + Conf['Stubs'] + "> Make stub"
+          innerHTML: "<input type=checkbox name=makeStub " + (Conf['Stubs'] ? 'checked' : '') + "> Make stub"
         });
         $.event('AddMenuEntry', {
           type: 'post',
@@ -3403,7 +3404,7 @@
         });
         $.on(apply, 'click', ThreadHiding.menu.hide);
         makeStub = $.el('label', {
-          innerHTML: "<input type=checkbox checked=" + Conf['Stubs'] + "> Make stub"
+          innerHTML: "<input type=checkbox " + (Conf['Stubs'] ? 'checked' : '') + "> Make stub"
         });
         hideStubLink = $.el('a', {
           textContent: 'Hide stub',

builds/crx/script.js

@@ -1,3 +1,4 @@
+// Generated by CoffeeScript
 /*
 * 4chan X - Version 1.1.17 - 2013-05-09
 *
@@ -2985,10 +2986,10 @@
           innerHTML: '<input type=checkbox name=thisPost checked> This post'
         });
         replies = $.el('label', {
-          innerHTML: "<input type=checkbox name=replies  checked=" + Conf['Recursive Hiding'] + "> Hide replies"
+          innerHTML: "<input type=checkbox name=replies  " + (Conf['Recursive Hiding'] ? 'checked' : '') + "> Hide replies"
         });
         makeStub = $.el('label', {
-          innerHTML: "<input type=checkbox name=makeStub checked=" + Conf['Stubs'] + "> Make stub"
+          innerHTML: "<input type=checkbox name=makeStub " + (Conf['Stubs'] ? 'checked' : '') + "> Make stub"
         });
         $.event('AddMenuEntry', {
           type: 'post',
@@ -3406,7 +3407,7 @@
         });
         $.on(apply, 'click', ThreadHiding.menu.hide);
         makeStub = $.el('label', {
-          innerHTML: "<input type=checkbox checked=" + Conf['Stubs'] + "> Make stub"
+          innerHTML: "<input type=checkbox " + (Conf['Stubs'] ? 'checked' : '') + "> Make stub"
         });
         hideStubLink = $.el('a', {
           textContent: 'Hide stub',

src/Filtering/PostHiding.coffee

@@ -35,9 +35,9 @@ PostHiding =
       thisPost = $.el 'label',
         innerHTML: '<input type=checkbox name=thisPost checked> This post'
       replies  = $.el 'label',
-        innerHTML: "<input type=checkbox name=replies  checked=#{Conf['Recursive Hiding']}> Hide replies"
+        innerHTML: "<input type=checkbox name=replies  #{if Conf['Recursive Hiding'] then 'checked' else ''}> Hide replies"
       makeStub = $.el 'label',
-        innerHTML: "<input type=checkbox name=makeStub checked=#{Conf['Stubs']}> Make stub"
+        innerHTML: "<input type=checkbox name=makeStub #{if Conf['Stubs'] then 'checked' else ''}> Make stub"
 
       $.event 'AddMenuEntry',
         type: 'post'

src/Filtering/ThreadHiding.coffee

@@ -69,7 +69,7 @@ ThreadHiding =
       $.on apply, 'click', ThreadHiding.menu.hide
 
       makeStub = $.el 'label',
-        innerHTML: "<input type=checkbox checked=#{Conf['Stubs']}> Make stub"
+        innerHTML: "<input type=checkbox #{if Conf['Stubs'] then 'checked' else ''}> Make stub"
 
       hideStubLink = $.el 'a',
         textContent: 'Hide stub'

src/General/meta/botproc.js

@@ -0,0 +1 @@
+// Generated by CoffeeScript