diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34bd633bc..720582b6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
### v1.14.14
+**v1.14.14.4** *(2019-09-16)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.14.4/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.14.4/builds/4chan-X-noupdate.crx)]
+- Merge v1.14.13.4: Update for quotelink changes on kissu.moe.
+- Don't try to insert header etc. on .rss URLs.
+
**v1.14.14.3** *(2019-09-14)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.14.3/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.14.3/builds/4chan-X-noupdate.crx)]
- Fix bug in handling captcha errors when using captcha prerequest.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 806d5694c..ea39259ca 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 86963c437..37d063634 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.14.14.3
+// @version 1.14.14.4
// @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 65a45a9f3..1f8011598 100644
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
-// @version 1.14.14.3
+// @version 1.14.14.4
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -211,7 +211,7 @@ docSet = function() {
};
g = {
- VERSION: '1.14.14.3',
+ VERSION: '1.14.14.4',
NAMESPACE: '4chan X.',
sites: Object.create(null),
boards: Object.create(null)
@@ -7848,7 +7848,7 @@ SW = {};
},
comment: '.body',
spoiler: '.spoiler',
- quotelink: 'a[onclick^="highlightReply("]',
+ quotelink: 'a[onclick*="highlightReply("]',
catalog: {
board: '#Grid',
thread: '.mix',
@@ -7872,8 +7872,8 @@ SW = {};
replyContainer: 'div[starts-with(@id,"reply_")]'
},
regexp: {
- quotelink: /\/([^\/]+)\/res\/(\d+)\.\w+#(\d+)$/,
- quotelinkHTML: /]*\bhref="[^"]*\/([^\/]+)\/res\/(\d+)\.\w+#(\d+)"/g
+ quotelink: /\/([^\/]+)\/res\/(\d+)(?:\.\w+)?#(\d+)$/,
+ quotelinkHTML: /]*\bhref="[^"]*\/([^\/]+)\/res\/(\d+)(?:\.\w+)?#(\d+)"/g
},
Build: {
parseJSON: function(data, board) {
@@ -28030,7 +28030,7 @@ Main = (function() {
},
isThisPageLegit: function() {
if (!('thisPageIsLegit' in Main)) {
- Main.thisPageIsLegit = g.SITE.isThisPageLegit ? g.SITE.isThisPageLegit() : !/^[45]\d\d\b/.test(document.title) && !/\.json$/.test(location.pathname);
+ Main.thisPageIsLegit = g.SITE.isThisPageLegit ? g.SITE.isThisPageLegit() : !/^[45]\d\d\b/.test(document.title) && !/\.(?:json|rss)$/.test(location.pathname);
}
return Main.thisPageIsLegit;
},
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index f47001dad..9e874aedc 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 b9eb96b46..3e2494b97 100644
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.14.14.3
+// @version 1.14.14.4
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -211,7 +211,7 @@ docSet = function() {
};
g = {
- VERSION: '1.14.14.3',
+ VERSION: '1.14.14.4',
NAMESPACE: '4chan X.',
sites: Object.create(null),
boards: Object.create(null)
@@ -7848,7 +7848,7 @@ SW = {};
},
comment: '.body',
spoiler: '.spoiler',
- quotelink: 'a[onclick^="highlightReply("]',
+ quotelink: 'a[onclick*="highlightReply("]',
catalog: {
board: '#Grid',
thread: '.mix',
@@ -7872,8 +7872,8 @@ SW = {};
replyContainer: 'div[starts-with(@id,"reply_")]'
},
regexp: {
- quotelink: /\/([^\/]+)\/res\/(\d+)\.\w+#(\d+)$/,
- quotelinkHTML: /]*\bhref="[^"]*\/([^\/]+)\/res\/(\d+)\.\w+#(\d+)"/g
+ quotelink: /\/([^\/]+)\/res\/(\d+)(?:\.\w+)?#(\d+)$/,
+ quotelinkHTML: /]*\bhref="[^"]*\/([^\/]+)\/res\/(\d+)(?:\.\w+)?#(\d+)"/g
},
Build: {
parseJSON: function(data, board) {
@@ -28030,7 +28030,7 @@ Main = (function() {
},
isThisPageLegit: function() {
if (!('thisPageIsLegit' in Main)) {
- Main.thisPageIsLegit = g.SITE.isThisPageLegit ? g.SITE.isThisPageLegit() : !/^[45]\d\d\b/.test(document.title) && !/\.json$/.test(location.pathname);
+ Main.thisPageIsLegit = g.SITE.isThisPageLegit ? g.SITE.isThisPageLegit() : !/^[45]\d\d\b/.test(document.title) && !/\.(?:json|rss)$/.test(location.pathname);
}
return Main.thisPageIsLegit;
},
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index fa3b57956..09fc8192b 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 ecd30181b..614da6ce8 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.14.14.3
+// @version 1.14.14.4
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 47a89d069..aa0265625 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.14.14.3
+// @version 1.14.14.4
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -211,7 +211,7 @@ docSet = function() {
};
g = {
- VERSION: '1.14.14.3',
+ VERSION: '1.14.14.4',
NAMESPACE: '4chan X.',
sites: Object.create(null),
boards: Object.create(null)
@@ -7848,7 +7848,7 @@ SW = {};
},
comment: '.body',
spoiler: '.spoiler',
- quotelink: 'a[onclick^="highlightReply("]',
+ quotelink: 'a[onclick*="highlightReply("]',
catalog: {
board: '#Grid',
thread: '.mix',
@@ -7872,8 +7872,8 @@ SW = {};
replyContainer: 'div[starts-with(@id,"reply_")]'
},
regexp: {
- quotelink: /\/([^\/]+)\/res\/(\d+)\.\w+#(\d+)$/,
- quotelinkHTML: /]*\bhref="[^"]*\/([^\/]+)\/res\/(\d+)\.\w+#(\d+)"/g
+ quotelink: /\/([^\/]+)\/res\/(\d+)(?:\.\w+)?#(\d+)$/,
+ quotelinkHTML: /]*\bhref="[^"]*\/([^\/]+)\/res\/(\d+)(?:\.\w+)?#(\d+)"/g
},
Build: {
parseJSON: function(data, board) {
@@ -28030,7 +28030,7 @@ Main = (function() {
},
isThisPageLegit: function() {
if (!('thisPageIsLegit' in Main)) {
- Main.thisPageIsLegit = g.SITE.isThisPageLegit ? g.SITE.isThisPageLegit() : !/^[45]\d\d\b/.test(document.title) && !/\.json$/.test(location.pathname);
+ Main.thisPageIsLegit = g.SITE.isThisPageLegit ? g.SITE.isThisPageLegit() : !/^[45]\d\d\b/.test(document.title) && !/\.(?:json|rss)$/.test(location.pathname);
}
return Main.thisPageIsLegit;
},
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 4007cd538..4b433fb7e 100644
Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ
diff --git a/builds/updates-beta.json b/builds/updates-beta.json
index c9f21ebe5..eb9f564fe 100644
--- a/builds/updates-beta.json
+++ b/builds/updates-beta.json
@@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": {
"updates": [
{
- "version": "1.14.14.3",
+ "version": "1.14.14.4",
"update_link": "https://www.4chan-x.net/builds/4chan-X-beta.crx"
}
]
diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml
index 666757e47..139ecf5cc 100644
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/builds/updates.json b/builds/updates.json
index 820830f18..81c280992 100644
--- a/builds/updates.json
+++ b/builds/updates.json
@@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": {
"updates": [
{
- "version": "1.14.14.3",
+ "version": "1.14.14.4",
"update_link": "https://www.4chan-x.net/builds/4chan-X.crx"
}
]
diff --git a/builds/updates.xml b/builds/updates.xml
index 6071c20ef..1191cdc53 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/version.json b/version.json
index 2dc06e17b..dc439636c 100644
--- a/version.json
+++ b/version.json
@@ -1,4 +1,4 @@
{
- "version": "1.14.14.3",
- "date": "2019-09-14T17:22:37.118Z"
+ "version": "1.14.14.4",
+ "date": "2019-09-16T04:34:13.281Z"
}
\ No newline at end of file