diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53bfd9a05..bfafcd66a 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### v1.9.1.1
+*2014-09-01*
+
+**ccd0**
+- Better fix for the bug pushing the QR's captcha response line offscreen. Previous fix caused problems with comment field resizing.
+
### v1.9.1.0
*2014-08-31*
diff --git a/LICENSE b/LICENSE
index f4bc59e56..6257866b6 100755
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
/*
-* 4chan X - Version 1.9.1.0
+* 4chan X - Version 1.9.1.1
*
* 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 bc9d9af3d..40d272b75 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 d13703be2..97024288a 100644
--- a/builds/4chan-X-beta.meta.js
+++ b/builds/4chan-X-beta.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.9.1.0
+// @version 1.9.1.1
// @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 dbb1c1982..d77e81c1a 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
-// @version 1.9.1.0
+// @version 1.9.1.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -24,7 +24,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.9.1.0
+* 4chan X - Version 1.9.1.1
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -374,7 +374,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.9.1.0',
+ VERSION: '1.9.1.1',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -4011,21 +4011,14 @@
}
};
drag = function(e) {
- var bottom, clientX, clientY, left, right, style, top, x, y;
+ var bottom, clientX, clientY, left, right, style, top;
clientX = e.clientX, clientY = e.clientY;
- x = clientX - this.dx;
- y = clientY - this.dy;
- left = right = top = bottom = null;
- if (x <= this.width / 2) {
- left = x < 10 ? '0px' : x / this.screenWidth * 100 + '%';
- } else {
- right = this.width - x < 10 ? '0px' : (this.width - x) / this.screenWidth * 100 + '%';
- }
- if (y <= this.height / 2) {
- top = y < 10 + this.topBorder ? this.topBorder + 'px' : y / this.screenHeight * 100 + '%';
- } else {
- bottom = this.height - y < 10 + this.bottomBorder ? this.bottomBorder + 'px' : (this.height - y) / this.screenHeight * 100 + '%';
- }
+ left = clientX - this.dx;
+ left = left < 10 ? 0 : this.width - left < 10 ? null : left / this.screenWidth * 100 + '%';
+ top = clientY - this.dy;
+ top = top < (10 + this.topBorder) ? this.topBorder + 'px' : this.height - top < (10 + this.bottomBorder) ? null : top / this.screenHeight * 100 + '%';
+ right = left === null ? 0 : null;
+ bottom = top === null ? this.bottomBorder + 'px' : null;
style = this.style;
style.left = left;
style.right = right;
@@ -6913,7 +6906,11 @@
subtree: true,
attributes: true
});
- return QR.captcha.load();
+ QR.captcha.load();
+ if (QR.nodes.el.getBoundingClientRect().bottom > doc.clientHeight) {
+ QR.nodes.el.style.top = null;
+ return QR.nodes.el.style.bottom = '0px';
+ }
},
destroy: function() {
$.globalEval('Recaptcha.destroy()');
@@ -12814,7 +12811,7 @@
className: 'dialog'
});
$.extend(dialog, {
- innerHTML: "
"
+ innerHTML: ""
});
$.on($('.export', Settings.dialog), 'click', Settings["export"]);
$.on($('.import', Settings.dialog), 'click', Settings["import"]);
diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx
index acc1bbd33..c1c273d4f 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 fe32c416a..5a326490a 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.1.0
+// @version 1.9.1.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -23,7 +23,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.9.1.0
+* 4chan X - Version 1.9.1.1
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -373,7 +373,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.9.1.0',
+ VERSION: '1.9.1.1',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -4010,21 +4010,14 @@
}
};
drag = function(e) {
- var bottom, clientX, clientY, left, right, style, top, x, y;
+ var bottom, clientX, clientY, left, right, style, top;
clientX = e.clientX, clientY = e.clientY;
- x = clientX - this.dx;
- y = clientY - this.dy;
- left = right = top = bottom = null;
- if (x <= this.width / 2) {
- left = x < 10 ? '0px' : x / this.screenWidth * 100 + '%';
- } else {
- right = this.width - x < 10 ? '0px' : (this.width - x) / this.screenWidth * 100 + '%';
- }
- if (y <= this.height / 2) {
- top = y < 10 + this.topBorder ? this.topBorder + 'px' : y / this.screenHeight * 100 + '%';
- } else {
- bottom = this.height - y < 10 + this.bottomBorder ? this.bottomBorder + 'px' : (this.height - y) / this.screenHeight * 100 + '%';
- }
+ left = clientX - this.dx;
+ left = left < 10 ? 0 : this.width - left < 10 ? null : left / this.screenWidth * 100 + '%';
+ top = clientY - this.dy;
+ top = top < (10 + this.topBorder) ? this.topBorder + 'px' : this.height - top < (10 + this.bottomBorder) ? null : top / this.screenHeight * 100 + '%';
+ right = left === null ? 0 : null;
+ bottom = top === null ? this.bottomBorder + 'px' : null;
style = this.style;
style.left = left;
style.right = right;
@@ -6912,7 +6905,11 @@
subtree: true,
attributes: true
});
- return QR.captcha.load();
+ QR.captcha.load();
+ if (QR.nodes.el.getBoundingClientRect().bottom > doc.clientHeight) {
+ QR.nodes.el.style.top = null;
+ return QR.nodes.el.style.bottom = '0px';
+ }
},
destroy: function() {
$.globalEval('Recaptcha.destroy()');
@@ -12813,7 +12810,7 @@
className: 'dialog'
});
$.extend(dialog, {
- innerHTML: ""
+ innerHTML: ""
});
$.on($('.export', Settings.dialog), 'click', Settings["export"]);
$.on($('.import', Settings.dialog), 'click', Settings["import"]);
diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx
index 8d9d3025a..d5ee63b7a 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 1870234b4..3c7426c3d 100644
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
-// @version 1.9.1.0
+// @version 1.9.1.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index a456fddac..65072b9ad 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.1.0
+// @version 1.9.1.1
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@@ -24,7 +24,7 @@
// ==/UserScript==
/*
-* 4chan X - Version 1.9.1.0
+* 4chan X - Version 1.9.1.1
*
* Licensed under the MIT license.
* https://github.com/ccd0/4chan-x/blob/master/LICENSE
@@ -374,7 +374,7 @@
doc = d.documentElement;
g = {
- VERSION: '1.9.1.0',
+ VERSION: '1.9.1.1',
NAMESPACE: '4chan X.',
NAME: '4chan X',
FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@@ -4011,21 +4011,14 @@
}
};
drag = function(e) {
- var bottom, clientX, clientY, left, right, style, top, x, y;
+ var bottom, clientX, clientY, left, right, style, top;
clientX = e.clientX, clientY = e.clientY;
- x = clientX - this.dx;
- y = clientY - this.dy;
- left = right = top = bottom = null;
- if (x <= this.width / 2) {
- left = x < 10 ? '0px' : x / this.screenWidth * 100 + '%';
- } else {
- right = this.width - x < 10 ? '0px' : (this.width - x) / this.screenWidth * 100 + '%';
- }
- if (y <= this.height / 2) {
- top = y < 10 + this.topBorder ? this.topBorder + 'px' : y / this.screenHeight * 100 + '%';
- } else {
- bottom = this.height - y < 10 + this.bottomBorder ? this.bottomBorder + 'px' : (this.height - y) / this.screenHeight * 100 + '%';
- }
+ left = clientX - this.dx;
+ left = left < 10 ? 0 : this.width - left < 10 ? null : left / this.screenWidth * 100 + '%';
+ top = clientY - this.dy;
+ top = top < (10 + this.topBorder) ? this.topBorder + 'px' : this.height - top < (10 + this.bottomBorder) ? null : top / this.screenHeight * 100 + '%';
+ right = left === null ? 0 : null;
+ bottom = top === null ? this.bottomBorder + 'px' : null;
style = this.style;
style.left = left;
style.right = right;
@@ -6913,7 +6906,11 @@
subtree: true,
attributes: true
});
- return QR.captcha.load();
+ QR.captcha.load();
+ if (QR.nodes.el.getBoundingClientRect().bottom > doc.clientHeight) {
+ QR.nodes.el.style.top = null;
+ return QR.nodes.el.style.bottom = '0px';
+ }
},
destroy: function() {
$.globalEval('Recaptcha.destroy()');
@@ -12814,7 +12811,7 @@
className: 'dialog'
});
$.extend(dialog, {
- innerHTML: ""
+ innerHTML: ""
});
$.on($('.export', Settings.dialog), 'click', Settings["export"]);
$.on($('.import', Settings.dialog), 'click', Settings["import"]);
diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip
index 3d88a3c27..88a48893f 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 53d48b22f..b8d410464 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 5f8bb860a..959862c43 100644
--- a/builds/updates.xml
+++ b/builds/updates.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/package.json b/package.json
index 61a7515d0..90f1da4c7 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.1.0",
+ "version": "1.9.1.1",
"repo": "https://github.com/ccd0/4chan-x/",
"page": "https://github.com/ccd0/4chan-x",
"downloads": "https://ccd0.github.io/4chan-x/builds/",