Tag:
%gLiteral %: %%
"
});
@@ -16881,7 +16933,7 @@
archBoards = {};
ref2 = Redirect.archives;
for (u = 0, len3 = ref2.length; u < len3; u++) {
- ref3 = ref2[u], name = ref3.name, boards = ref3.boards, files = ref3.files, software = ref3.software, withCredentials = ref3.withCredentials;
+ ref3 = ref2[u], uid = ref3.uid, name = ref3.name, boards = ref3.boards, files = ref3.files, software = ref3.software, withCredentials = ref3.withCredentials;
for (v = 0, len4 = boards.length; v < len4; v++) {
boardID = boards[v];
o = archBoards[boardID] || (archBoards[boardID] = {
@@ -16890,30 +16942,31 @@
file: [[], []]
});
i = +(!!withCredentials);
- o.thread[i].push(name);
+ archive = [uid != null ? uid : name, name];
+ o.thread[i].push(archive);
if (software === 'foolfuuka') {
- o.post[i].push(name);
+ o.post[i].push(archive);
}
if (indexOf.call(files, boardID) >= 0) {
- o.file[i].push(name);
+ o.file[i].push(archive);
}
}
}
for (boardID in archBoards) {
o = archBoards[boardID];
ref4 = ['thread', 'post', 'file'];
- for (w = 0, len5 = ref4.length; w < len5; w++) {
- item = ref4[w];
+ for (y = 0, len5 = ref4.length; y < len5; y++) {
+ item = ref4[y];
i = o[item][0].length ? 1 : 0;
- o[item][i].push('disabled');
+ o[item][i].push([null, 'disabled']);
o[item] = o[item][0].concat(o[item][1]);
}
}
rows = [];
boardOptions = [];
ref5 = Object.keys(archBoards).sort();
- for (y = 0, len6 = ref5.length; y < len6; y++) {
- boardID = ref5[y];
+ for (z = 0, len6 = ref5.length; z < len6; z++) {
+ boardID = ref5[z];
row = $.el('tr', {
className: "board-" + boardID
});
@@ -16925,8 +16978,8 @@
}));
o = archBoards[boardID];
ref6 = ['thread', 'post', 'file'];
- for (z = 0, len7 = ref6.length; z < len7; z++) {
- item = ref6[z];
+ for (aa = 0, len7 = ref6.length; aa < len7; aa++) {
+ item = ref6[aa];
$.add(row, Settings.addArchiveCell(boardID, o, item));
}
rows.push(row);
@@ -16943,14 +16996,14 @@
return $("tbody > ." + this.value, table).hidden = false;
});
$.get('selectedArchives', Conf['selectedArchives'], function(arg) {
- var data, option, selectedArchives, type;
+ var data, id, select, selectedArchives, type;
selectedArchives = arg.selectedArchives;
for (boardID in selectedArchives) {
data = selectedArchives[boardID];
for (type in data) {
- name = data[type];
- if (option = $("select[data-boardid='" + boardID + "'][data-type='" + type + "'] > option[value='" + name + "']", section)) {
- option.selected = true;
+ id = data[type];
+ if (select = $("select[data-boardid='" + boardID + "'][data-type='" + type + "']", section)) {
+ select.value = JSON.stringify(id);
}
}
}
@@ -16971,8 +17024,8 @@
while (i < length) {
archive = data[type][i++];
options.push($.el('option', {
- textContent: archive,
- value: archive
+ value: JSON.stringify(archive[0]),
+ textContent: archive[1]
}));
}
$.extend(td, {
@@ -16992,7 +17045,7 @@
return function(arg) {
var name1, selectedArchives;
selectedArchives = arg.selectedArchives;
- (selectedArchives[name1 = _this.dataset.boardid] || (selectedArchives[name1] = {}))[_this.dataset.type] = _this.value;
+ (selectedArchives[name1 = _this.dataset.boardid] || (selectedArchives[name1] = {}))[_this.dataset.type] = JSON.parse(_this.value);
return $.set('selectedArchives', selectedArchives);
};
})(this));
@@ -17216,26 +17269,16 @@
});
},
upgrade: function(items) {
- var compareString, items2, previousversion, ref, ref1;
+ var changes, previousversion;
previousversion = items.previousversion;
- items2 = {
+ changes = {
previousversion: g.VERSION
};
- compareString = previousversion.replace(/\d+/g, function(x) {
- return ('0000' + x).slice(-5);
- });
- if (compareString < '00001.00011.00008.00000') {
- if (items['Fixed Thread Watcher'] == null) {
- items2['Fixed Thread Watcher'] = (ref = items['Toggleable Thread Watcher']) != null ? ref : true;
- }
- if (items['Exempt Archives from Encryption'] == null) {
- items2['Exempt Archives from Encryption'] = (ref1 = items['Except Archives from Encryption']) != null ? ref1 : false;
- }
- }
- $.extend(items, items2);
- return $.set(items2, function() {
- var el, ref2;
- if ((ref2 = items['Show Updated Notifications']) != null ? ref2 : true) {
+ $.extend(changes, Settings.upgrade(items, previousversion));
+ $.extend(items, changes);
+ return $.set(changes, function() {
+ var el, ref;
+ if ((ref = items['Show Updated Notifications']) != null ? ref : true) {
el = $.el('span', {
innerHTML: "4chan X has been updated to
version " + E(g.VERSION) + "."
});
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 4398907f5..54cbfc34f 100644
Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ
diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js
index 67a50436c..b6e7421ab 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.11.10.0
+// @version 1.11.10.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 6e1bf8862..8c7c4e9f3 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
-// @version 1.11.10.0
+// @version 1.11.10.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -412,7 +412,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.10.0',
+ VERSION: '1.11.10.1',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -4995,6 +4995,7 @@
headers = {};
}
workaround = $.engine === 'gecko' && (typeof GM_info !== "undefined" && GM_info !== null) && /^[0-2]\.|^3\.[01](?!\d)/.test(GM_info.version);
+ workaround || (workaround = /PaleMoon\//.test(navigator.userAgent));
workaround || (workaround = (typeof GM_info !== "undefined" && GM_info !== null ? (ref = GM_info.script) != null ? ref.includeJSB : void 0 : void 0) != null);
options = {
method: "GET",
@@ -7140,7 +7141,7 @@
return status.disabled = disabled || false;
},
quote: function(e) {
- var ancestor, caretPos, com, frag, index, insideCode, k, len1, len2, len3, len4, len5, len6, node, post, q, range, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, sel, text, thread, u, v, w, y;
+ var ancestor, caretPos, com, frag, index, insideCode, k, len1, len2, len3, len4, len5, len6, node, post, q, range, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, sel, text, thread, u, v, y, z;
if (e != null) {
e.preventDefault();
}
@@ -7185,13 +7186,13 @@
$.replace(node, [$.tn('[code]')].concat(slice.call(node.childNodes), [$.tn('[/code]')]));
}
ref4 = $$('.linkify[data-original]', frag);
- for (w = 0, len5 = ref4.length; w < len5; w++) {
- node = ref4[w];
+ for (y = 0, len5 = ref4.length; y < len5; y++) {
+ node = ref4[y];
$.replace(node, $.tn(node.dataset.original));
}
ref5 = $$('.embedder', frag);
- for (y = 0, len6 = ref5.length; y < len6; y++) {
- node = ref5[y];
+ for (z = 0, len6 = ref5.length; z < len6; z++) {
+ node = ref5[z];
if (((ref6 = node.previousSibling) != null ? ref6.nodeValue : void 0) === ' ') {
$.rm(node.previousSibling);
}
@@ -7854,7 +7855,7 @@
initNoscript: function() {
this.noscript = true;
this.images = $$('.fbc-payload-imageselect > input');
- if (!this.images.length) {
+ if (this.images.length !== 9) {
return;
}
$.addStyle(this.cssNoscript);
@@ -7870,7 +7871,7 @@
img = ref[k];
img.tabIndex = 0;
}
- if (this.images.length) {
+ if (this.images.length === 9) {
return this.addTooltips(this.images);
}
},
@@ -7918,36 +7919,36 @@
}
},
keybinds: function(e) {
- var dx, i, key, reload, verify, x;
+ var dx, i, key, last, n, reload, verify, w, x;
if (!(this.images && doc.contains(this.images[0]))) {
return;
}
+ n = this.images.length;
+ w = Math.round(Math.sqrt(n));
+ last = n + w - 1;
reload = $('#recaptcha-reload-button, .fbc-button-reload');
verify = $('#recaptcha-verify-button, .fbc-button-verify > input');
x = this.images.indexOf(d.activeElement);
if (x < 0) {
- x = d.activeElement === verify ? 11 : 9;
+ x = d.activeElement === verify ? last : n;
}
key = Keybinds.keyCode(e);
- if (!this.noscript && key === 'Space' && x < 9) {
+ if (!this.noscript && key === 'Space' && x < n) {
this.images[x].click();
- } else if ((i = this.imageKeys.indexOf(key)) >= 0) {
+ } else if (n === 9 && (i = this.imageKeys.indexOf(key)) >= 0) {
this.images[i % 9].click();
verify.focus();
} else if (dx = {
- 'Up': 9,
- 'Down': 3,
- 'Left': 11,
+ 'Up': n,
+ 'Down': w,
+ 'Left': last,
'Right': 1
}[key]) {
- x = (x + dx) % 12;
- if (x === 10) {
- x = dx === 11 ? 9 : 11;
+ x = (x + dx) % (n + w);
+ if ((n < x && x < last)) {
+ x = dx === last ? n : last;
}
- (this.images[x] || {
- 9: reload,
- 11: verify
- }[x]).focus();
+ (this.images[x] || (x === n ? reload : void 0) || (x === last ? verify : void 0)).focus();
} else {
return;
}
@@ -13962,20 +13963,6 @@
});
return ThreadWatcher.refresh();
},
- convert: function(oldFormat) {
- var boardID, data, newFormat, threadID, threads;
- newFormat = {};
- for (boardID in oldFormat) {
- threads = oldFormat[boardID];
- for (threadID in threads) {
- data = threads[threadID];
- (newFormat[boardID] || (newFormat[boardID] = {}))[threadID] = {
- excerpt: data.textContent
- };
- }
- }
- return newFormat;
- },
menu: {
refreshers: [],
init: function() {
@@ -14368,7 +14355,7 @@
Redirect = {
init: function() {
- var archive, archives, boardID, boards, data, files, id, k, len1, len2, name, o, q, record, ref, ref1, software, type, withCredentials;
+ var archive, archives, boardID, boards, data, files, id, k, len1, len2, name, o, q, record, ref, ref1, software, type, uid, withCredentials;
o = {
thread: {},
post: {},
@@ -14379,8 +14366,8 @@
ref = Redirect.archives;
for (k = 0, len1 = ref.length; k < len1; k++) {
data = ref[k];
- name = data.name, boards = data.boards, files = data.files, software = data.software, withCredentials = data.withCredentials;
- archives[name] = data;
+ uid = data.uid, name = data.name, boards = data.boards, files = data.files, software = data.software, withCredentials = data.withCredentials;
+ archives[JSON.stringify(uid != null ? uid : name)] = data;
for (q = 0, len2 = boards.length; q < len2; q++) {
boardID = boards[q];
if (!withCredentials) {
@@ -14404,9 +14391,9 @@
record = ref1[boardID];
for (type in record) {
id = record[type];
- if (id === 'disabled') {
+ if (id === null) {
delete o[type][boardID];
- } else if (archive = archives[id]) {
+ } else if (archive = archives[JSON.stringify(id)]) {
boards = type === 'file' ? archive.files : archive.boards;
if (indexOf.call(boards, boardID) >= 0) {
o[type][boardID] = archive;
@@ -14416,7 +14403,7 @@
}
return Redirect.data = o;
},
- archives: [{"uid":0,"name":"Moe","domain":"archive.moe","http":false,"https":true,"software":"foolfuuka","boards":["a","an","biz","c","co","diy","fit","gd","gif","h","i","int","jp","k","m","mlp","out","po","qa","r9k","s4s","sci","tg","tv","u","v","vg","vp","vr","wsg"],"files":["a","an","biz","c","co","diy","fit","gd","gif","h","i","int","jp","k","m","mlp","out","po","qa","r9k","s4s","sci","tg","u","v","vg","vp","vr","wsg"]},{"uid":3,"name":"4plebs Archive","domain":"archive.4plebs.org","http":true,"https":true,"software":"foolfuuka","boards":["adv","f","hr","o","pol","s4s","tg","trv","tv","x"],"files":["adv","f","hr","o","pol","s4s","tg","trv","tv","x"]},{"uid":4,"name":"Nyafuu Archive","domain":"archive.nyafuu.org","http":true,"https":true,"software":"foolfuuka","boards":["c","e","w","wg"],"files":["c","e","w","wg"]},{"uid":5,"name":"Love is Over","domain":"archive.loveisover.me","http":true,"https":true,"software":"foolfuuka","boards":["c","d","e","i","lgbt","t","u"],"files":["c","d","e","i","lgbt","t","u"]},{"uid":8,"name":"Rebecca Black Tech","domain":"rbt.asia","http":false,"https":true,"software":"fuuka","boards":["cgl","g","mu","qa","w"],"files":["cgl","g","mu","qa","w"]},{"uid":10,"name":"warosu","domain":"warosu.org","http":false,"https":true,"software":"fuuka","boards":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"],"files":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"]},{"uid":15,"name":"fgts","domain":"fgts.jp","http":true,"https":true,"software":"foolfuuka","boards":["asp","b","cm","h","hc","hm","n","p","qa","r","s","soc","toy","y"],"files":["asp","b","cm","h","hc","hm","n","p","qa","r","s","soc","toy","y"]},{"uid":22,"name":"not4plebs","domain":"totally.not4plebs.org","http":true,"https":true,"software":"foolfuuka","boards":["sp"],"files":["sp"]},{"uid":23,"name":"DesuStorage","domain":"archive.desustorage.org","http":false,"https":true,"software":"foolfuuka","boards":["mlp","qa"],"files":["mlp","qa"]},{"uid":24,"name":"fireden.net","domain":"boards.fireden.net","http":false,"https":true,"software":"foolfuuka","boards":["cm","ic","vg","y"],"files":["cm","ic","vg","y"]}],
+ archives: [{"uid":0,"name":"Moe","domain":"archive.moe","http":false,"https":true,"software":"foolfuuka","boards":["a","an","biz","c","co","diy","fit","gd","gif","h","i","int","jp","k","m","mlp","out","po","qa","r9k","s4s","sci","tg","tv","u","v","vg","vp","vr","wsg"],"files":["a","an","biz","c","co","diy","fit","gd","gif","h","i","int","jp","k","m","mlp","out","po","qa","r9k","s4s","sci","tg","u","v","vg","vp","vr","wsg"]},{"uid":3,"name":"4plebs Archive","domain":"archive.4plebs.org","http":true,"https":true,"software":"foolfuuka","boards":["adv","f","hr","o","pol","s4s","tg","trv","tv","x"],"files":["adv","f","hr","o","pol","s4s","tg","trv","tv","x"]},{"uid":4,"name":"Nyafuu Archive","domain":"archive.nyafuu.org","http":true,"https":true,"software":"foolfuuka","boards":["c","e","w","wg"],"files":["c","e","w","wg"]},{"uid":5,"name":"Love is Over","domain":"archive.loveisover.me","http":true,"https":true,"software":"foolfuuka","boards":["c","d","e","i","lgbt","t","u"],"files":["c","d","e","i","lgbt","t","u"]},{"uid":8,"name":"Rebecca Black Tech","domain":"rbt.asia","http":false,"https":true,"software":"fuuka","boards":["cgl","g","mu","qa","w"],"files":["cgl","g","mu","qa","w"]},{"uid":10,"name":"warosu","domain":"warosu.org","http":false,"https":true,"software":"fuuka","boards":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"],"files":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"]},{"uid":15,"name":"fgts","domain":"fgts.jp","http":true,"https":true,"software":"foolfuuka","boards":["asp","b","cm","h","hc","hm","n","p","qa","r","s","soc","toy","y"],"files":["asp","b","cm","h","hc","hm","n","p","qa","r","s","soc","toy","y"]},{"uid":22,"name":"not4plebs","domain":"totally.not4plebs.org","http":true,"https":true,"software":"foolfuuka","boards":["sp"],"files":["sp"]},{"uid":23,"name":"archive.horse","domain":"4ch.archive.horse","http":false,"https":true,"software":"foolfuuka","boards":["mlp","qa"],"files":["mlp","qa"]},{"uid":24,"name":"fireden.net","domain":"boards.fireden.net","http":false,"https":true,"software":"foolfuuka","boards":["cm","ic","vg","y"],"files":["cm","ic","vg","y"]}],
to: function(dest, data) {
var archive;
archive = (dest === 'search' || dest === 'board' ? Redirect.data.thread : Redirect.data[dest])[data.boardID];
@@ -16637,6 +16624,7 @@
if (!(file = this.files[0])) {
return;
}
+ this.value = null;
output = $('.imp-exp-result');
if (!confirm('Your current settings will be entirely overwritten, are you sure?')) {
output.textContent = 'Import aborted.';
@@ -16661,10 +16649,9 @@
};
return reader.readAsText(file);
},
- loadSettings: function(data, cb) {
- var convertSettings, key, ref, val, version;
- version = data.version.split('.');
- if (version[0] === '2') {
+ convertFrom: {
+ loadletter: function(data) {
+ var base1, boardID, convertSettings, key, ref, ref1, threadData, threadID, threads, val;
convertSettings = function(data, map) {
var newKey, prevKey;
for (prevKey in map) {
@@ -16677,7 +16664,8 @@
return data;
};
data = convertSettings(data, {
- 'Disable 4chan\'s extension': '',
+ 'Disable 4chan\'s extension': 'Disable Native Extension',
+ 'Comment Auto-Expansion': '',
'Remove Slug': '',
'Check for Updates': '',
'Recursive Filtering': 'Recursive Hiding',
@@ -16688,6 +16676,10 @@
'Reveal Spoilers': 'Reveal Spoiler Thumbnails',
'Expand From Current': 'Expand from here',
'Post in Title': 'Thread Excerpt',
+ 'Current Page': 'Page Count in Stats',
+ 'Current Page Position': '',
+ 'Alternative captcha': 'Use Recaptcha v1',
+ 'Auto Submit': 'Post on Captcha Completion',
'Open Reply in New Tab': 'Open Post in New Tab',
'Remember QR size': 'Remember QR Size',
'Remember Subject': '',
@@ -16753,13 +16745,73 @@
});
}
}
- data.Conf['WatchedThreads'] = data.WatchedThreads;
+ if (data.WatchedThreads) {
+ data.Conf['watchedThreads'] = {
+ boards: {}
+ };
+ ref1 = data.WatchedThreads;
+ for (boardID in ref1) {
+ threads = ref1[boardID];
+ for (threadID in threads) {
+ threadData = threads[threadID];
+ ((base1 = data.Conf['watchedThreads'].boards)[boardID] || (base1[boardID] = {}))[threadID] = {
+ excerpt: threadData.textContent
+ };
+ }
+ }
+ }
+ return data;
}
- if (data.Conf['WatchedThreads']) {
- data.Conf['watchedThreads'] = {
- boards: ThreadWatcher.convert(data.Conf['WatchedThreads'])
- };
- delete data.Conf['WatchedThreads'];
+ },
+ upgrade: function(data, version) {
+ var boardID, changes, compareString, name, record, ref, ref1, ref2, type, uids;
+ changes = {};
+ compareString = version.replace(/\d+/g, function(x) {
+ return ('0000' + x).slice(-5);
+ });
+ if (compareString < '00001.00011.00008.00000') {
+ if (data['Fixed Thread Watcher'] == null) {
+ changes['Fixed Thread Watcher'] = (ref = data['Toggleable Thread Watcher']) != null ? ref : true;
+ }
+ if (data['Exempt Archives from Encryption'] == null) {
+ changes['Exempt Archives from Encryption'] = (ref1 = data['Except Archives from Encryption']) != null ? ref1 : false;
+ }
+ }
+ if (compareString < '00001.00011.00010.00001') {
+ if (data['selectedArchives'] != null) {
+ uids = {
+ "Moe": 0,
+ "4plebs Archive": 3,
+ "Nyafuu Archive": 4,
+ "Love is Over": 5,
+ "Rebecca Black Tech": 8,
+ "warosu": 10,
+ "fgts": 15,
+ "not4plebs": 22,
+ "DesuStorage": 23,
+ "fireden.net": 24,
+ "disabled": null
+ };
+ changes['selectedArchives'] = data['selectedArchives'];
+ ref2 = changes['selectedArchives'];
+ for (boardID in ref2) {
+ record = ref2[boardID];
+ for (type in record) {
+ name = record[type];
+ if (name in uids) {
+ record[type] = uids[name];
+ }
+ }
+ }
+ }
+ }
+ return changes;
+ },
+ loadSettings: function(data, cb) {
+ if (data.version.split('.')[0] === '2') {
+ data = Settings.convertFrom.loadletter(data);
+ } else if (data.version !== g.VERSION) {
+ $.extend(data.Conf, Settings.upgrade(data.Conf, data.version));
}
return $.clear(function(err) {
if (err) {
@@ -16823,7 +16875,7 @@
return $.on(ta, 'change', $.cb.value);
},
advanced: function(section) {
- var applyCSS, archBoards, boardID, boardOptions, boardSelect, boards, customCSS, files, i, input, inputs, interval, item, items, k, len1, len2, len3, len4, len5, len6, len7, name, o, q, ref, ref1, ref2, ref3, ref4, ref5, ref6, row, rows, software, ta, table, u, v, w, warning, withCredentials, y, z;
+ var aa, applyCSS, archBoards, archive, boardID, boardOptions, boardSelect, boards, customCSS, files, i, input, inputs, interval, item, items, k, len1, len2, len3, len4, len5, len6, len7, name, o, q, ref, ref1, ref2, ref3, ref4, ref5, ref6, row, rows, software, ta, table, u, uid, v, warning, withCredentials, y, z;
$.extend(section, {
innerHTML: "