diff --git a/CHANGELOG.md b/CHANGELOG.md
index 039ce2c5c..2f067277e 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.13
+**v1.10.13.3** *(2015-06-03)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.13.3/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.13.3/builds/4chan-X-noupdate.crx "Chromium version")]
+- Merge v1.10.12.10: Revert workaround for scrolling to top as it seems to have been fixed on Google's end.
+
**v1.10.13.2** *(2015-06-03)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.13.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.13.2/builds/4chan-X-noupdate.crx "Chromium version")]
- Merge v1.10.12.9: Update for captcha changes.
- Merge v1.10.12.9: Work around issue where the captcha causes scrolling to the top of the page.
diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx
index 9e28c33ed..eb5cf2c4a 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 99d89d0a4..aeb7f78a8 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.13.2
+// @version 1.10.13.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 42202a762..b72d4b2c5 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.13.2
+// @version 1.10.13.3
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -396,7 +396,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.10.13.2',
+ VERSION: '1.10.13.3',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -6877,8 +6877,9 @@
});
},
inBubble: function() {
- var ref;
- return ref = d.activeElement, indexOf.call($$('.goog-bubble-content > iframe'), ref) >= 0;
+ return $$('.goog-bubble-content > iframe').some(function(el) {
+ return el.getBoundingClientRect().bottom > 0;
+ });
},
inCaptcha: function() {
var ref;
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index 0ed2d0016..e73ada053 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 26241f68b..56fa47014 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.13.2
+// @version 1.10.13.3
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -395,7 +395,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.10.13.2',
+ VERSION: '1.10.13.3',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -6876,8 +6876,9 @@
});
},
inBubble: function() {
- var ref;
- return ref = d.activeElement, indexOf.call($$('.goog-bubble-content > iframe'), ref) >= 0;
+ return $$('.goog-bubble-content > iframe').some(function(el) {
+ return el.getBoundingClientRect().bottom > 0;
+ });
},
inCaptcha: function() {
var ref;
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 84c136995..13caaed08 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 00b2589fa..ab2778b06 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.10.13.2
+// @version 1.10.13.3
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 61b49a0a3..83f186936 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.13.2
+// @version 1.10.13.3
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -396,7 +396,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.10.13.2',
+ VERSION: '1.10.13.3',
NAMESPACE: '4chan X.',
boards: {}
};
@@ -6877,8 +6877,9 @@
});
},
inBubble: function() {
- var ref;
- return ref = d.activeElement, indexOf.call($$('.goog-bubble-content > iframe'), ref) >= 0;
+ return $$('.goog-bubble-content > iframe').some(function(el) {
+ return el.getBoundingClientRect().bottom > 0;
+ });
},
inCaptcha: function() {
var ref;
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 25ea9a87c..598eb011b 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 046ad84c1..2ab62b815 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 85cbcb996..23cb15950 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/package.json b/package.json
index 7ad6648bf..ce7b278f6 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.13.2",
- "date": "2015-06-04T01:35:08.056Z",
+ "version": "1.10.13.3",
+ "date": "2015-06-04T02:56:03.644Z",
"repo": "https://github.com/ccd0/4chan-x/",
"page": "https://github.com/ccd0/4chan-x",
"downloads": "https://ccd0.github.io/4chan-x/builds/",