diff --git a/CHANGELOG.md b/CHANGELOG.md
index af1f86131..a6cd147c2 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
### v1.11.10
+**v1.11.10.2** *(2015-08-25)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.10.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.10.2/builds/4chan-X-noupdate.crx "Chromium version")]
+- Disable Alt+Number and Alt+Arrow in text fields to fix conflict with Alt+NumPad character input.
+
**v1.11.10.1** *(2015-08-22)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.10.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.10.1/builds/4chan-X-noupdate.crx "Chromium version")]
- Merge v1.11.9.3: Try to support the new non-3x3 captchas. Note: not tested on non-3x3 captchas yet.
- Merge v1.11.9.4: Archive list update: desustorage.org -> archive.horse.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 511e76cff..c6c4cadaf 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 a8a936582..fffe3c81c 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.11.10.1
+// @version 1.11.10.2
// @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 2aab43e35..044a476c0 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.11.10.1
+// @version 1.11.10.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -412,7 +412,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.10.1',
+ VERSION: '1.11.10.2',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -3154,7 +3154,7 @@
name: 'Catalog Features',
cb: this.catalogNode
});
- this.search = ((ref = history.state) != null ? ref.search : void 0) || '';
+ this.search = ((ref = history.state) != null ? ref.searched : void 0) || '';
if ((ref1 = history.state) != null ? ref1.mode : void 0) {
Conf['Index Mode'] = (ref2 = history.state) != null ? ref2.mode : void 0;
}
@@ -3454,12 +3454,12 @@
return Index.buildIndex();
},
popstate: function(e) {
- var mode, page, ref, ref1, search, state;
+ var mode, page, ref, ref1, searched, state;
if (e != null ? e.state : void 0) {
- ref = e.state, search = ref.search, mode = ref.mode;
+ ref = e.state, searched = ref.searched, mode = ref.mode;
state = {};
- if (Index.search !== search) {
- state.search = Index.search = search;
+ if (Index.search !== searched) {
+ state.search = Index.search = searched;
}
if (Conf['Index Mode'] !== mode) {
state.mode = mode;
@@ -3587,7 +3587,7 @@
}
history[state.replace ? 'replaceState' : 'pushState']({
mode: Conf['Index Mode'],
- search: Index.search,
+ searched: Index.search,
oldpage: pageBeforeSearch
}, '', pathname + hash);
return state;
@@ -15528,7 +15528,7 @@
}
target = e.target;
if ((ref = target.nodeName) === 'INPUT' || ref === 'TEXTAREA') {
- if (!/(Esc|Alt|Ctrl|Meta|Shift\+\w{2,})/.test(key)) {
+ if (!(/(Esc|Alt|Ctrl|Meta|Shift\+\w{2,})/.test(key) && !/^Alt\+(\d|Up|Down|Left|Right)$/.test(key))) {
return;
}
}
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 845e83f48..79d34a71d 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 c18ca701b..bc180f566 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.11.10.1
+// @version 1.11.10.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -412,7 +412,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.10.1',
+ VERSION: '1.11.10.2',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -3154,7 +3154,7 @@
name: 'Catalog Features',
cb: this.catalogNode
});
- this.search = ((ref = history.state) != null ? ref.search : void 0) || '';
+ this.search = ((ref = history.state) != null ? ref.searched : void 0) || '';
if ((ref1 = history.state) != null ? ref1.mode : void 0) {
Conf['Index Mode'] = (ref2 = history.state) != null ? ref2.mode : void 0;
}
@@ -3454,12 +3454,12 @@
return Index.buildIndex();
},
popstate: function(e) {
- var mode, page, ref, ref1, search, state;
+ var mode, page, ref, ref1, searched, state;
if (e != null ? e.state : void 0) {
- ref = e.state, search = ref.search, mode = ref.mode;
+ ref = e.state, searched = ref.searched, mode = ref.mode;
state = {};
- if (Index.search !== search) {
- state.search = Index.search = search;
+ if (Index.search !== searched) {
+ state.search = Index.search = searched;
}
if (Conf['Index Mode'] !== mode) {
state.mode = mode;
@@ -3587,7 +3587,7 @@
}
history[state.replace ? 'replaceState' : 'pushState']({
mode: Conf['Index Mode'],
- search: Index.search,
+ searched: Index.search,
oldpage: pageBeforeSearch
}, '', pathname + hash);
return state;
@@ -15528,7 +15528,7 @@
}
target = e.target;
if ((ref = target.nodeName) === 'INPUT' || ref === 'TEXTAREA') {
- if (!/(Esc|Alt|Ctrl|Meta|Shift\+\w{2,})/.test(key)) {
+ if (!(/(Esc|Alt|Ctrl|Meta|Shift\+\w{2,})/.test(key) && !/^Alt\+(\d|Up|Down|Left|Right)$/.test(key))) {
return;
}
}
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 54cbfc34f..eb80b3e3f 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 b6e7421ab..6f71d4e78 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.1
+// @version 1.11.10.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 8c7c4e9f3..8822739e8 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.1
+// @version 1.11.10.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -412,7 +412,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.11.10.1',
+ VERSION: '1.11.10.2',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -3154,7 +3154,7 @@
name: 'Catalog Features',
cb: this.catalogNode
});
- this.search = ((ref = history.state) != null ? ref.search : void 0) || '';
+ this.search = ((ref = history.state) != null ? ref.searched : void 0) || '';
if ((ref1 = history.state) != null ? ref1.mode : void 0) {
Conf['Index Mode'] = (ref2 = history.state) != null ? ref2.mode : void 0;
}
@@ -3454,12 +3454,12 @@
return Index.buildIndex();
},
popstate: function(e) {
- var mode, page, ref, ref1, search, state;
+ var mode, page, ref, ref1, searched, state;
if (e != null ? e.state : void 0) {
- ref = e.state, search = ref.search, mode = ref.mode;
+ ref = e.state, searched = ref.searched, mode = ref.mode;
state = {};
- if (Index.search !== search) {
- state.search = Index.search = search;
+ if (Index.search !== searched) {
+ state.search = Index.search = searched;
}
if (Conf['Index Mode'] !== mode) {
state.mode = mode;
@@ -3587,7 +3587,7 @@
}
history[state.replace ? 'replaceState' : 'pushState']({
mode: Conf['Index Mode'],
- search: Index.search,
+ searched: Index.search,
oldpage: pageBeforeSearch
}, '', pathname + hash);
return state;
@@ -15528,7 +15528,7 @@
}
target = e.target;
if ((ref = target.nodeName) === 'INPUT' || ref === 'TEXTAREA') {
- if (!/(Esc|Alt|Ctrl|Meta|Shift\+\w{2,})/.test(key)) {
+ if (!(/(Esc|Alt|Ctrl|Meta|Shift\+\w{2,})/.test(key) && !/^Alt\+(\d|Up|Down|Left|Right)$/.test(key))) {
return;
}
}
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 0847d6182..eea916902 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 94358889e..b5c4b1045 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 93cb5054c..7d18a77e5 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/package.json b/package.json
index f22fe7316..62edf3bb6 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,8 @@
"meta": {
"name": "4chan X",
"fork": "ccd0",
- "version": "1.11.10.1",
- "date": "2015-08-22T22:34:20.901Z",
+ "version": "1.11.10.2",
+ "date": "2015-08-25T22:35:56.707Z",
"page": "https://www.4chan-x.net/",
"downloads": "https://www.4chan-x.net/builds/",
"oldVersions": "https://raw.githubusercontent.com/ccd0/4chan-x/",