diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e1d6857b..e501c2ad2 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@ The attributions below are for work that has been incorporated into the script a
The links to individual versions below are to copies of the script with the update URL removed. If you want automatic updates, install the script from the links on the [main page](https://github.com/ccd0/4chan-x).
+### v1.9.18.5
+*2014-12-30* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.18.5/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.18.5/builds/4chan-X-noupdate.crx "Chromium version")]
+
+**ccd0**
+- Merge v1.9.17.12: Fix some settings not being saved when exited with Esc key.
+
### v1.9.18.4
*2014-12-30* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.18.4/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.18.4/builds/4chan-X-noupdate.crx "Chromium version")]
diff --git a/LICENSE b/LICENSE
index 65e3135e6..35b4b3a48 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
/*
-* 4chan X - Version 1.9.18.4
+* 4chan X - Version 1.9.18.5
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index a6fa082f5..2f89a1028 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 c872dcdae..bdaeaf076 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.9.18.4
+// @version 1.9.18.5
// @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 140ea3eee..d33f53c6b 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.9.18.4
+// @version 1.9.18.5
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -25,7 +25,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.9.18.4
+* 4chan X - Version 1.9.18.5
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -395,7 +395,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.9.18.4',
+ VERSION: '1.9.18.5',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -14740,9 +14740,13 @@
return $.event('OpenSettings', null, dialog);
},
close: function() {
+ var _ref;
if (!Settings.dialog) {
return;
}
+ if ((_ref = d.activeElement) != null) {
+ _ref.blur();
+ }
$.rm(Settings.overlay);
$.rm(Settings.dialog);
delete Settings.overlay;
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 5aa3a75e8..4ae8657f9 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 bcf540ae0..14e94e5c8 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.9.18.4
+// @version 1.9.18.5
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -24,7 +24,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.9.18.4
+* 4chan X - Version 1.9.18.5
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -394,7 +394,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.9.18.4',
+ VERSION: '1.9.18.5',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -14739,9 +14739,13 @@
return $.event('OpenSettings', null, dialog);
},
close: function() {
+ var _ref;
if (!Settings.dialog) {
return;
}
+ if ((_ref = d.activeElement) != null) {
+ _ref.blur();
+ }
$.rm(Settings.overlay);
$.rm(Settings.dialog);
delete Settings.overlay;
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index ed87fc9e2..a99b41062 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 a8aae9ee0..5f3639b64 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.9.18.4
+// @version 1.9.18.5
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index fa724df9a..257152557 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.9.18.4
+// @version 1.9.18.5
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -25,7 +25,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.9.18.4
+* 4chan X - Version 1.9.18.5
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -395,7 +395,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.9.18.4',
+ VERSION: '1.9.18.5',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -14740,9 +14740,13 @@
return $.event('OpenSettings', null, dialog);
},
close: function() {
+ var _ref;
if (!Settings.dialog) {
return;
}
+ if ((_ref = d.activeElement) != null) {
+ _ref.blur();
+ }
$.rm(Settings.overlay);
$.rm(Settings.dialog);
delete Settings.overlay;
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index ba49d98e7..268d84203 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 2975fd7ad..25106ee03 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 b96fb13b1..ee6ad272b 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/package.json b/package.json
index c7619f3a2..695cf2ea0 100755
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"description": "Cross-browser userscript for maximum lurking on 4chan.",
"meta": {
"name": "4chan X",
- "version": "1.9.18.4",
+ "version": "1.9.18.5",
"repo": "https://github.com/ccd0/4chan-x/",
"page": "https://github.com/ccd0/4chan-x",
"downloads": "https://ccd0.github.io/4chan-x/builds/",