...
This commit is contained in:
parent
798b6dd7d2
commit
8a8f14d7ce
4
LICENSE
4
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
|
||||
*/
|
||||
*/
|
||||
@ -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.
|
||||
|
||||
@ -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;', "<div class=move><label><input type=checkbox id=autohide title=Auto-hide>Quick Reply</label><a href=javascript:; class=close title=Close>×</a><select data-name=thread title='Create a new thread / Reply'><option value=new>New thread</option></select></div><form><div class=persona><input name=name data-name=name list=\"list-name\" placeholder=Name class=field size=1 tabindex=10><input name=email data-name=email list=\"list-email\" placeholder=E-mail class=field size=1 tabindex=20><input name=sub data-name=sub list=\"list-sub\" placeholder=Subject class=field size=1 tabindex=30> </div><div class=textarea><textarea data-name=com placeholder=Comment class=field tabindex=40></textarea><span id=char-count></span></div><div id=dump-list-container><div id=dump-list></div><a id=add-post href=javascript:; title=\"Add a post\" tabindex=50>+</a></div><div id=file-n-submit><span id=qr-filename-container class=field tabindex=60><span id=qr-no-file>No selected file</span><input id=\"qr-filename\" data-name=\"filename\" spellcheck=\"false\"><span id=qr-extras-container><a id=qr-filerm href=javascript:; title='Remove file'><i class=\"fa fa-times-circle\"></i></a><a id=url-button title='Post from url'><i class=\"fa fa-link\"></i></a><a id=dump-button title='Dump list'><i class=\"fa fa-plus-square\"></i></a></span></span><label id=qr-spoiler-label><input type=checkbox id=qr-file-spoiler title='Spoiler image' tabindex=70></label><input type=submit tabindex=80></div><input type=file multiple></form><datalist id=\"list-name\"></datalist><datalist id=\"list-email\"></datalist><datalist id=\"list-sub\"></datalist> ")
|
||||
};
|
||||
@ -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,
|
||||
|
||||
@ -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": {
|
||||
|
||||
@ -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;', "<div class=move><label><input type=checkbox id=autohide title=Auto-hide>Quick Reply</label><a href=javascript:; class=close title=Close>×</a><select data-name=thread title='Create a new thread / Reply'><option value=new>New thread</option></select></div><form><div class=persona><input name=name data-name=name list=\"list-name\" placeholder=Name class=field size=1 tabindex=10><input name=email data-name=email list=\"list-email\" placeholder=E-mail class=field size=1 tabindex=20><input name=sub data-name=sub list=\"list-sub\" placeholder=Subject class=field size=1 tabindex=30> </div><div class=textarea><textarea data-name=com placeholder=Comment class=field tabindex=40></textarea><span id=char-count></span></div><div id=dump-list-container><div id=dump-list></div><a id=add-post href=javascript:; title=\"Add a post\" tabindex=50>+</a></div><div id=file-n-submit><span id=qr-filename-container class=field tabindex=60><span id=qr-no-file>No selected file</span><input id=\"qr-filename\" data-name=\"filename\" spellcheck=\"false\"><span id=qr-extras-container><a id=qr-filerm href=javascript:; title='Remove file'><i class=\"fa fa-times-circle\"></i></a><a id=url-button title='Post from url'><i class=\"fa fa-link\"></i></a><a id=dump-button title='Dump list'><i class=\"fa fa-plus-square\"></i></a></span></span><label id=qr-spoiler-label><input type=checkbox id=qr-file-spoiler title='Spoiler image' tabindex=70></label><input type=submit tabindex=80></div><input type=file multiple></form><datalist id=\"list-name\"></datalist><datalist id=\"list-email\"></datalist><datalist id=\"list-sub\"></datalist> ")
|
||||
};
|
||||
@ -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,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user