diff --git a/CHANGELOG.md b/CHANGELOG.md
index 707bcca20..c40a18f5b 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ The links to individual versions below are to copies of the script with the upda
### v1.10.6
+**v1.10.6.3** *(2015-03-23)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.6.3/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.6.3/builds/4chan-X-noupdate.crx "Chromium version")]
+- Drop `Remove Original Link` option; work around DownThemAll limitations a better way.
+
**v1.10.6.2** *(2015-03-22)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.6.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.6.2/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix conflict with 4chan imgur thumbnail script, hopefully correctly this time.
- Add `Remove Original Link` suboption (default: off) to `File Info Formatting` to remove rather than hide the original link in the file info.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index abd9065af..40c337e12 100644
Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ
diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js
index 524187daf..bb9db3cbc 100644
--- a/builds/4chan-X-beta.meta.js
+++ b/builds/4chan-X-beta.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
-// @version 1.10.6.2
+// @version 1.10.6.3
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js
index bd0977dac..6e3777045 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X beta
-// @version 1.10.6.2
+// @version 1.10.6.3
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -134,7 +134,6 @@
'Relative Date Title': [true, 'Show Relative Post Date only when hovering over dates.', 1],
'Comment Expansion': [true, 'Expand comments that are too long to display on the index. Not applicable with JSON Navigation.'],
'File Info Formatting': [true, 'Reformat the file information.'],
- 'Remove Original Link': [false, 'Remove the original file link rather than hiding it. May cause incompatibilities with other scripts.', 1],
'Thread Expansion': [true, 'Add buttons to expand threads.'],
'Index Navigation': [false, 'Add buttons to navigate between threads.'],
'Reply Navigation': [false, 'Add buttons to navigate to top / bottom of thread.'],
@@ -396,7 +395,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.10.6.2',
+ VERSION: '1.10.6.3',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -14284,29 +14283,20 @@
});
},
node: function() {
- var info, nextSibling, parentNode, wrapper;
+ var info, oldInfo;
if (!this.file || this.isClone) {
return;
}
+ oldInfo = $.el('span', {
+ className: 'original-file-info'
+ });
+ $.prepend(this.file.link.parentNode, oldInfo);
+ $.add(oldInfo, [this.file.link.previousSibling, this.file.link, this.file.link.nextSibling]);
info = $.el('span', {
className: 'file-info'
});
FileInfo.format(Conf['fileInfo'], this, info);
- if (Conf['Remove Original Link'] && !(this.board.ID === 'f' && Conf['Enable Native Flash Embedding'])) {
- parentNode = this.file.link.parentNode;
- $.rmAll(parentNode);
- return $.add(parentNode, info);
- } else {
- this.file.link.previousSibling.nodeValue = '';
- this.file.link.hidden = true;
- nextSibling = this.file.link.nextSibling;
- wrapper = $.el('span', {
- hidden: true
- });
- $.replace(nextSibling, wrapper);
- $.add(wrapper, nextSibling);
- return $.after(wrapper, info);
- }
+ return $.prepend(this.file.text, info);
},
format: function(formatString, post, outputNode) {
var output;
@@ -17966,6 +17956,7 @@
" clear: both;\n" +
"}\n" +
"/* File */\n" +
+".original-file-info,\n" +
".fnswitch:hover > .fntrunc,\n" +
".fnswitch:not(:hover) > .fnfull,\n" +
".expanded-image > .post > .file > .fileThumb > video[data-md5],\n" +
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 8d89a327a..a4735165c 100644
Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ
diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js
index d6aec40c4..7b37a5dc3 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
-// @version 1.10.6.2
+// @version 1.10.6.3
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -133,7 +133,6 @@
'Relative Date Title': [true, 'Show Relative Post Date only when hovering over dates.', 1],
'Comment Expansion': [true, 'Expand comments that are too long to display on the index. Not applicable with JSON Navigation.'],
'File Info Formatting': [true, 'Reformat the file information.'],
- 'Remove Original Link': [false, 'Remove the original file link rather than hiding it. May cause incompatibilities with other scripts.', 1],
'Thread Expansion': [true, 'Add buttons to expand threads.'],
'Index Navigation': [false, 'Add buttons to navigate between threads.'],
'Reply Navigation': [false, 'Add buttons to navigate to top / bottom of thread.'],
@@ -395,7 +394,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.10.6.2',
+ VERSION: '1.10.6.3',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -14283,29 +14282,20 @@
});
},
node: function() {
- var info, nextSibling, parentNode, wrapper;
+ var info, oldInfo;
if (!this.file || this.isClone) {
return;
}
+ oldInfo = $.el('span', {
+ className: 'original-file-info'
+ });
+ $.prepend(this.file.link.parentNode, oldInfo);
+ $.add(oldInfo, [this.file.link.previousSibling, this.file.link, this.file.link.nextSibling]);
info = $.el('span', {
className: 'file-info'
});
FileInfo.format(Conf['fileInfo'], this, info);
- if (Conf['Remove Original Link'] && !(this.board.ID === 'f' && Conf['Enable Native Flash Embedding'])) {
- parentNode = this.file.link.parentNode;
- $.rmAll(parentNode);
- return $.add(parentNode, info);
- } else {
- this.file.link.previousSibling.nodeValue = '';
- this.file.link.hidden = true;
- nextSibling = this.file.link.nextSibling;
- wrapper = $.el('span', {
- hidden: true
- });
- $.replace(nextSibling, wrapper);
- $.add(wrapper, nextSibling);
- return $.after(wrapper, info);
- }
+ return $.prepend(this.file.text, info);
},
format: function(formatString, post, outputNode) {
var output;
@@ -17965,6 +17955,7 @@
" clear: both;\n" +
"}\n" +
"/* File */\n" +
+".original-file-info,\n" +
".fnswitch:hover > .fntrunc,\n" +
".fnswitch:not(:hover) > .fnfull,\n" +
".expanded-image > .post > .file > .fileThumb > video[data-md5],\n" +
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index e48902821..fa4f3563c 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 0298418a3..006ad5471 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.10.6.2
+// @version 1.10.6.3
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index cc2dd892b..2ce3e596d 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.10.6.2
+// @version 1.10.6.3
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -134,7 +134,6 @@
'Relative Date Title': [true, 'Show Relative Post Date only when hovering over dates.', 1],
'Comment Expansion': [true, 'Expand comments that are too long to display on the index. Not applicable with JSON Navigation.'],
'File Info Formatting': [true, 'Reformat the file information.'],
- 'Remove Original Link': [false, 'Remove the original file link rather than hiding it. May cause incompatibilities with other scripts.', 1],
'Thread Expansion': [true, 'Add buttons to expand threads.'],
'Index Navigation': [false, 'Add buttons to navigate between threads.'],
'Reply Navigation': [false, 'Add buttons to navigate to top / bottom of thread.'],
@@ -396,7 +395,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.10.6.2',
+ VERSION: '1.10.6.3',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -14284,29 +14283,20 @@
});
},
node: function() {
- var info, nextSibling, parentNode, wrapper;
+ var info, oldInfo;
if (!this.file || this.isClone) {
return;
}
+ oldInfo = $.el('span', {
+ className: 'original-file-info'
+ });
+ $.prepend(this.file.link.parentNode, oldInfo);
+ $.add(oldInfo, [this.file.link.previousSibling, this.file.link, this.file.link.nextSibling]);
info = $.el('span', {
className: 'file-info'
});
FileInfo.format(Conf['fileInfo'], this, info);
- if (Conf['Remove Original Link'] && !(this.board.ID === 'f' && Conf['Enable Native Flash Embedding'])) {
- parentNode = this.file.link.parentNode;
- $.rmAll(parentNode);
- return $.add(parentNode, info);
- } else {
- this.file.link.previousSibling.nodeValue = '';
- this.file.link.hidden = true;
- nextSibling = this.file.link.nextSibling;
- wrapper = $.el('span', {
- hidden: true
- });
- $.replace(nextSibling, wrapper);
- $.add(wrapper, nextSibling);
- return $.after(wrapper, info);
- }
+ return $.prepend(this.file.text, info);
},
format: function(formatString, post, outputNode) {
var output;
@@ -17966,6 +17956,7 @@
" clear: both;\n" +
"}\n" +
"/* File */\n" +
+".original-file-info,\n" +
".fnswitch:hover > .fntrunc,\n" +
".fnswitch:not(:hover) > .fnfull,\n" +
".expanded-image > .post > .file > .fileThumb > video[data-md5],\n" +
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 9c949fd81..aad179627 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index 52a3bb267..11ec6fc78 100644
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/builds/updates.xml b/builds/updates.xml
index d1f7cc394..ca5685345 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/package.json b/package.json
index 3d0b1e09f..0ff4b4e12 100755
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
"description": "Cross-browser userscript for maximum lurking on 4chan.",
"meta": {
"name": "4chan X",
- "version": "1.10.6.2",
- "date": "2015-03-23T06:43:31.843Z",
+ "version": "1.10.6.3",
+ "date": "2015-03-23T13:07:03.503Z",
"repo": "https://github.com/ccd0/4chan-x/",
"page": "https://github.com/ccd0/4chan-x",
"downloads": "https://ccd0.github.io/4chan-x/builds/",