diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5098d081d..4baff2bb4 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+### v1.3.8
+*2014-02-20*
+
+**MayhemYDG**
+- Fix QR
+**Spittie**
+- Better url handling
+
### v1.3.7
*2014-02-15*
diff --git a/LICENSE b/LICENSE
index 3de861d73..8de30cfd2 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
/*
-* 4chan X - Version 1.3.7 - 2014-02-18
+* 4chan X - Version 1.3.8 - 2014-02-20
*
* Licensed under the MIT license.
* https://github.com/Spittie/4chan-x/blob/master/LICENSE
diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js
index 1e33a70b1..3aeb905ea 100755
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.3.7
+// @version 1.3.8
// @minGMVer 1.13
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 3b186fd89..ea636b596 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.3.7
+// @version 1.3.8
// @minGMVer 1.13
// @minFFVer 26
// @namespace 4chan-X
@@ -23,7 +23,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.3.7 - 2014-02-18
+* 4chan X - Version 1.3.8 - 2014-02-20
*
* Licensed under the MIT license.
* https://github.com/Spittie/4chan-x/blob/master/LICENSE
@@ -360,7 +360,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.3.7',
+ VERSION: '1.3.8',
NAMESPACE: '4chan X.',
boards: {},
threads: {},
@@ -5807,7 +5807,7 @@
return list.value = g.VIEW === 'thread' ? g.THREADID : 'new';
},
dialog: function() {
- var check, dialog, elm, event, flagSelector, i, items, key, mimeTypes, name, node, nodes, save, value, _ref;
+ var dialog, elm, event, flagSelector, i, items, key, name, node, nodes, save, value, _ref;
QR.nodes = nodes = {
el: dialog = UI.dialog('qr', 'top:0;right:0;', " ")
};
@@ -5841,16 +5841,9 @@
value = _ref[key];
nodes[key] = $(value, dialog);
}
- check = {
- jpg: 'image/jpeg',
- pdf: 'application/pdf',
- swf: 'application/x-shockwave-flash'
- };
- mimeTypes = $('ul.rules > li').textContent.trim().match(/: (.+)/)[1].toLowerCase().replace(/\w+/g, function(type) {
- return check[type] || ("image/" + type);
+ ({
+ mimeTypes: ['image/jpeg', 'image/png', 'image/gif', 'application/pdf', 'application/x-shockwave-flash', '']
});
- QR.mimeTypes = mimeTypes.split(', ');
- QR.mimeTypes.push('');
nodes.fileInput.max = $('input[name=MAX_FILE_SIZE]').value;
QR.spoiler = !!$('input[name=spoiler]');
if (QR.spoiler) {
@@ -9917,16 +9910,38 @@
Redirect = {
init: function() {
- var archive, archives, boardID, boards, data, files, id, name, o, record, software, type, _i, _len, _ref, _ref1;
+ var archive, archives, boardID, boards, data, files, id, name, o, record, software, type, _i, _j, _len, _len1, _ref, _ref1, _ref2;
o = {
thread: {},
post: {},
file: {}
};
- archives = Redirect.archives;
- _ref = Conf['selectedArchives'];
- for (boardID in _ref) {
- record = _ref[boardID];
+ archives = {};
+ _ref = Redirect.archives;
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ _ref1 = _ref[_i], name = _ref1.name, boards = _ref1.boards, files = _ref1.files, data = _ref1.data;
+ archives[name] = {
+ boards: boards,
+ files: files,
+ data: data
+ };
+ software = data.software;
+ for (_j = 0, _len1 = boards.length; _j < _len1; _j++) {
+ boardID = boards[_j];
+ if (!(boardID in o.thread)) {
+ o.thread[boardID] = data;
+ }
+ if (!(boardID in o.post || software !== 'foolfuuka')) {
+ o.post[boardID] = data;
+ }
+ if (!(boardID in o.file || __indexOf.call(files, boardID) < 0)) {
+ o.file[boardID] = data;
+ }
+ }
+ }
+ _ref2 = Conf['selectedArchives'];
+ for (boardID in _ref2) {
+ record = _ref2[boardID];
for (type in record) {
id = record[type];
if (!((archive = archives[id]))) {
@@ -9939,22 +9954,6 @@
o[type][boardID] = archive.data;
}
}
- for (name in archives) {
- _ref1 = archives[name], data = _ref1.data, boards = _ref1.boards, files = _ref1.files;
- software = data.software;
- for (_i = 0, _len = boards.length; _i < _len; _i++) {
- boardID = boards[_i];
- if (!(boardID in o.thread)) {
- o.thread[boardID] = data;
- }
- if (!(boardID in o.post || software !== 'foolfuuka')) {
- o.post[boardID] = data;
- }
- if (!(boardID in o.file || __indexOf.call(files, boardID) < 0)) {
- o.file[boardID] = data;
- }
- }
- }
return Redirect.data = o;
},
archives: {
diff --git a/builds/crx.crx b/builds/crx.crx
index 73648275e..946989232 100644
Binary files a/builds/crx.crx and b/builds/crx.crx differ
diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json
index 187d2efd1..2cedef4b0 100755
--- a/builds/crx/manifest.json
+++ b/builds/crx/manifest.json
@@ -1,6 +1,6 @@
{
"name": "4chan X",
- "version": "1.3.7",
+ "version": "1.3.8",
"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 9519b9001..0ae089cbf 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -1,6 +1,6 @@
// Generated by CoffeeScript
/*
-* 4chan X - Version 1.3.7 - 2014-02-18
+* 4chan X - Version 1.3.8 - 2014-02-20
*
* Licensed under the MIT license.
* https://github.com/Spittie/4chan-x/blob/master/LICENSE
@@ -337,7 +337,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.3.7',
+ VERSION: '1.3.8',
NAMESPACE: '4chan X.',
boards: {},
threads: {},
@@ -5811,7 +5811,7 @@
return list.value = g.VIEW === 'thread' ? g.THREADID : 'new';
},
dialog: function() {
- var check, dialog, elm, event, flagSelector, i, items, key, mimeTypes, name, node, nodes, save, value, _ref;
+ var dialog, elm, event, flagSelector, i, items, key, name, node, nodes, save, value, _ref;
QR.nodes = nodes = {
el: dialog = UI.dialog('qr', 'top:0;right:0;', " ")
};
@@ -5845,16 +5845,9 @@
value = _ref[key];
nodes[key] = $(value, dialog);
}
- check = {
- jpg: 'image/jpeg',
- pdf: 'application/pdf',
- swf: 'application/x-shockwave-flash'
- };
- mimeTypes = $('ul.rules > li').textContent.trim().match(/: (.+)/)[1].toLowerCase().replace(/\w+/g, function(type) {
- return check[type] || ("image/" + type);
+ ({
+ mimeTypes: ['image/jpeg', 'image/png', 'image/gif', 'application/pdf', 'application/x-shockwave-flash', '']
});
- QR.mimeTypes = mimeTypes.split(', ');
- QR.mimeTypes.push('');
nodes.fileInput.max = $('input[name=MAX_FILE_SIZE]').value;
QR.spoiler = !!$('input[name=spoiler]');
if (QR.spoiler) {
@@ -9910,16 +9903,38 @@
Redirect = {
init: function() {
- var archive, archives, boardID, boards, data, files, id, name, o, record, software, type, _i, _len, _ref, _ref1;
+ var archive, archives, boardID, boards, data, files, id, name, o, record, software, type, _i, _j, _len, _len1, _ref, _ref1, _ref2;
o = {
thread: {},
post: {},
file: {}
};
- archives = Redirect.archives;
- _ref = Conf['selectedArchives'];
- for (boardID in _ref) {
- record = _ref[boardID];
+ archives = {};
+ _ref = Redirect.archives;
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ _ref1 = _ref[_i], name = _ref1.name, boards = _ref1.boards, files = _ref1.files, data = _ref1.data;
+ archives[name] = {
+ boards: boards,
+ files: files,
+ data: data
+ };
+ software = data.software;
+ for (_j = 0, _len1 = boards.length; _j < _len1; _j++) {
+ boardID = boards[_j];
+ if (!(boardID in o.thread)) {
+ o.thread[boardID] = data;
+ }
+ if (!(boardID in o.post || software !== 'foolfuuka')) {
+ o.post[boardID] = data;
+ }
+ if (!(boardID in o.file || __indexOf.call(files, boardID) < 0)) {
+ o.file[boardID] = data;
+ }
+ }
+ }
+ _ref2 = Conf['selectedArchives'];
+ for (boardID in _ref2) {
+ record = _ref2[boardID];
for (type in record) {
id = record[type];
if (!((archive = archives[id]))) {
@@ -9932,22 +9947,6 @@
o[type][boardID] = archive.data;
}
}
- for (name in archives) {
- _ref1 = archives[name], data = _ref1.data, boards = _ref1.boards, files = _ref1.files;
- software = data.software;
- for (_i = 0, _len = boards.length; _i < _len; _i++) {
- boardID = boards[_i];
- if (!(boardID in o.thread)) {
- o.thread[boardID] = data;
- }
- if (!(boardID in o.post || software !== 'foolfuuka')) {
- o.post[boardID] = data;
- }
- if (!(boardID in o.file || __indexOf.call(files, boardID) < 0)) {
- o.file[boardID] = data;
- }
- }
- }
return Redirect.data = o;
},
archives: {
diff --git a/builds/xpi/4chanx.xpi b/builds/xpi/4chanx.xpi
index 0278e14a4..e85615b10 100644
Binary files a/builds/xpi/4chanx.xpi and b/builds/xpi/4chanx.xpi differ
diff --git a/latest.js b/latest.js
index d15637805..17a3d5d6e 100755
--- a/latest.js
+++ b/latest.js
@@ -1 +1 @@
-postMessage({version:'1.3.7'},'*')
+postMessage({version:'1.3.8'},'*')
diff --git a/package.json b/package.json
index 1e91e433a..0232a4576 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "4chan-X",
- "version": "1.3.7",
+ "version": "1.3.8",
"description": "Cross-browser userscript for maximum lurking on 4chan.",
"meta": {
"name": "4chan X",