diff --git a/src/components/views/auth/CaptchaForm.js b/src/components/views/auth/CaptchaForm.js
index ca450c5df4..d3b7d0bfe5 100644
--- a/src/components/views/auth/CaptchaForm.js
+++ b/src/components/views/auth/CaptchaForm.js
@@ -17,7 +17,6 @@ limitations under the License.
'use strict';
import React from 'react';
-import ReactDOM from 'react-dom';
import PropTypes from 'prop-types';
import { _t } from '../../../languageHandler';
@@ -61,29 +60,15 @@ module.exports = React.createClass({
} else {
console.log("Loading recaptcha script...");
window.mx_on_recaptcha_loaded = () => {this._onCaptchaLoaded();};
- const protocol = global.location.protocol;
+ let protocol = global.location.protocol;
if (protocol === "vector:") {
- const warning = document.createElement('div');
- // XXX: fix hardcoded app URL. Better solutions include:
- // * jumping straight to a hosted captcha page (but we don't support that yet)
- // * embedding the captcha in an iframe (if that works)
- // * using a better captcha lib
- ReactDOM.render(_t(
- "Robot check is currently unavailable on desktop - please use a web browser",
- {},
- {
- 'a': (sub) => {
- return { sub };
- },
- }), warning);
- this.refs.recaptchaContainer.appendChild(warning);
- } else {
- const scriptTag = document.createElement('script');
- scriptTag.setAttribute(
- 'src', protocol+"//www.google.com/recaptcha/api.js?onload=mx_on_recaptcha_loaded&render=explicit",
- );
- this.refs.recaptchaContainer.appendChild(scriptTag);
+ protocol = "https:";
}
+ const scriptTag = document.createElement('script');
+ scriptTag.setAttribute(
+ 'src', `${protocol}//www.google.com/recaptcha/api.js?onload=mx_on_recaptcha_loaded&render=explicit`,
+ );
+ this.refs.recaptchaContainer.appendChild(scriptTag);
}
},
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9afcc07147..57a9501c5e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1224,7 +1224,6 @@
"Sign in": "Sign in",
"Login": "Login",
"powered by Matrix": "powered by Matrix",
- "Robot check is currently unavailable on desktop - please use a web browser": "Robot check is currently unavailable on desktop - please use a web browser",
"This homeserver would like to make sure you are not a robot.": "This homeserver would like to make sure you are not a robot.",
"Custom Server Options": "Custom Server Options",
"You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.",