diff --git a/LICENSE b/LICENSE index efcb8dc5a..f300f091f 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.3.8 - 2014-02-20 +* 4chan X - Version 1.3.9 - 2014-02-20 * * Licensed under the MIT license. * https://github.com/Spittie/4chan-x/blob/master/LICENSE @@ -77,4 +77,4 @@ * All rights reserved. * * license: https://github.com/4chan/4chan-JS/blob/master/LICENSE -*/ +*/ \ No newline at end of file diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index 9457477b0..babf3ad31 100755 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,7 +1,7 @@ // ==UserScript== // @name 4chan X -// @version 1.3.8 -// @minGMVer 1.13 +// @version 1.3.9 +// @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X // @description Cross-browser userscript for maximum lurking on 4chan. diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 9dec0620b..d2fc0f9b2 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,13 +1,8 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -<<<<<<< HEAD -// @version 1.3.8 -// @minGMVer 1.13 -======= -// @version 1.3.7 +// @version 1.3.9 // @minGMVer 1.14 ->>>>>>> remotes/zix/v3 // @minFFVer 26 // @namespace 4chan-X // @description Cross-browser userscript for maximum lurking on 4chan. @@ -29,11 +24,7 @@ // ==/UserScript== /* -<<<<<<< HEAD -* 4chan X - Version 1.3.8 - 2014-02-20 -======= -* 4chan X - Version 1.3.7 - 2014-02-20 ->>>>>>> remotes/zix/v3 +* 4chan X - Version 1.3.9 - 2014-02-20 * * Licensed under the MIT license. * https://github.com/Spittie/4chan-x/blob/master/LICENSE @@ -373,7 +364,7 @@ doc = d.documentElement; g = { - VERSION: '1.3.8', + VERSION: '1.3.9', NAMESPACE: '4chan X.', boards: {} }; @@ -5671,6 +5662,9 @@ $.on(d, 'drop', QR.dropFile); $.on(d, 'dragstart dragend', QR.drag); return { + catalog: function() { + return $.on(d, 'IndexRefresh', QR.generatePostableThreadsList); + }, index: function() { return $.on(d, 'IndexRefresh', QR.generatePostableThreadsList); }, @@ -6064,11 +6058,7 @@ return list.value = g.VIEW === 'thread' ? g.THREADID : 'new'; }, dialog: function() { -<<<<<<< HEAD - var dialog, elm, event, flagSelector, i, items, key, name, node, nodes, save, value, _ref; -======= var dialog, elm, event, i, items, key, name, node, nodes, save, value, _ref; ->>>>>>> remotes/zix/v3 QR.nodes = nodes = { el: dialog = UI.dialog('qr', 'top:0;right:0;', "
") }; @@ -10398,17 +10388,10 @@ http: true, software: "fuuka" } -<<<<<<< HEAD - }, - "warosu": { - boards: ["3", "biz", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"], - files: ["3", "biz", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"], -======= }, { name: "warosu", boards: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"], files: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"], ->>>>>>> remotes/zix/v3 data: { domain: "fuuka.warosu.org", https: true, @@ -10433,12 +10416,6 @@ http: true, software: "foolfuuka" } -<<<<<<< HEAD - }, - "Foolz Beta": { - boards: ["a", "biz", "co", "d", "gd", "jp", "m", "mlp", "s4s", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"], - files: ["a", "biz", "d", "gd", "jp", "m", "s4s", "tg", "u", "vg", "vp", "vr", "wsg"], -======= }, { name: "installgentoo.com", boards: ["g", "t"], @@ -10452,7 +10429,6 @@ name: "Foolz Beta", boards: ["a", "co", "gd", "jp", "m", "s4s", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"], files: ["a", "gd", "jp", "m", "s4s", "tg", "u", "vg", "vp", "vr", "wsg"], ->>>>>>> remotes/zix/v3 data: { domain: "beta.foolz.us", http: true, diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json index 2cedef4b0..d4ad7c9f7 100755 --- a/builds/crx/manifest.json +++ b/builds/crx/manifest.json @@ -1,6 +1,6 @@ { "name": "4chan X", - "version": "1.3.8", + "version": "1.3.9", "manifest_version": 2, "description": "Cross-browser userscript for maximum lurking on 4chan.", "icons": { diff --git a/builds/crx/script.js b/builds/crx/script.js index b1dd8a2b9..6f01e9e8c 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,10 +1,6 @@ // Generated by CoffeeScript /* -<<<<<<< HEAD -* 4chan X - Version 1.3.8 - 2014-02-20 -======= -* 4chan X - Version 1.3.7 - 2014-02-20 ->>>>>>> remotes/zix/v3 +* 4chan X - Version 1.3.9 - 2014-02-20 * * Licensed under the MIT license. * https://github.com/Spittie/4chan-x/blob/master/LICENSE @@ -344,7 +340,7 @@ doc = d.documentElement; g = { - VERSION: '1.3.8', + VERSION: '1.3.9', NAMESPACE: '4chan X.', boards: {} }; @@ -5701,6 +5697,9 @@ $.on(d, 'drop', QR.dropFile); $.on(d, 'dragstart dragend', QR.drag); return { + catalog: function() { + return $.on(d, 'IndexRefresh', QR.generatePostableThreadsList); + }, index: function() { return $.on(d, 'IndexRefresh', QR.generatePostableThreadsList); }, @@ -6095,11 +6094,7 @@ return list.value = g.VIEW === 'thread' ? g.THREADID : 'new'; }, dialog: function() { -<<<<<<< HEAD - var dialog, elm, event, flagSelector, i, items, key, name, node, nodes, save, value, _ref; -======= var dialog, elm, event, i, items, key, name, node, nodes, save, value, _ref; ->>>>>>> remotes/zix/v3 QR.nodes = nodes = { el: dialog = UI.dialog('qr', 'top:0;right:0;', " ") }; @@ -10396,17 +10391,10 @@ http: true, software: "fuuka" } -<<<<<<< HEAD - }, - "warosu": { - boards: ["3", "biz", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"], - files: ["3", "biz", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"], -======= }, { name: "warosu", boards: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"], files: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"], ->>>>>>> remotes/zix/v3 data: { domain: "fuuka.warosu.org", https: true, @@ -10431,12 +10419,6 @@ http: true, software: "foolfuuka" } -<<<<<<< HEAD - }, - "Foolz Beta": { - boards: ["a", "biz", "co", "d", "gd", "jp", "m", "mlp", "s4s", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"], - files: ["a", "biz", "d", "gd", "jp", "m", "s4s", "tg", "u", "vg", "vp", "vr", "wsg"], -======= }, { name: "installgentoo.com", boards: ["g", "t"], @@ -10450,7 +10432,6 @@ name: "Foolz Beta", boards: ["a", "co", "gd", "jp", "m", "s4s", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"], files: ["a", "gd", "jp", "m", "s4s", "tg", "u", "vg", "vp", "vr", "wsg"], ->>>>>>> remotes/zix/v3 data: { domain: "beta.foolz.us", http: true, diff --git a/latest.js b/latest.js index 17a3d5d6e..5d78b1519 100755 --- a/latest.js +++ b/latest.js @@ -1 +1 @@ -postMessage({version:'1.3.8'},'*') +postMessage({version:'1.3.9'},'*')