diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-11-17 10:21:51 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-11-17 10:21:51 +0000 |
commit | 1d3ef8734cea9a1ce8befdf27db297ca70cfeee3 (patch) | |
tree | 12c7ac945749c68b81e3ae55c39dfd58ae824bf0 /syweb/webclient/login/register-controller.js | |
parent | Merge PDUs and Events into one object (diff) | |
parent | Move getLastMessage to modelService. (diff) | |
download | synapse-1d3ef8734cea9a1ce8befdf27db297ca70cfeee3.tar.xz |
Merge remote-tracking branch 'origin/develop' into merge_pdu_event_objects
Diffstat (limited to 'syweb/webclient/login/register-controller.js')
-rw-r--r-- | syweb/webclient/login/register-controller.js | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/syweb/webclient/login/register-controller.js b/syweb/webclient/login/register-controller.js index b23a72b185..ec48def487 100644 --- a/syweb/webclient/login/register-controller.js +++ b/syweb/webclient/login/register-controller.js @@ -20,7 +20,7 @@ angular.module('RegisterController', ['matrixService']) 'use strict'; var config = window.webClientConfig; - var useCaptcha = true; + var useCaptcha = false; // default to no captcha to make it easier to get a homeserver up and running... if (config !== undefined) { useCaptcha = config.useCaptcha; } @@ -167,16 +167,10 @@ angular.module('RegisterController', ['matrixService']) var setupCaptcha = function() { console.log("Setting up ReCaptcha") - var config = window.webClientConfig; - var public_key = undefined; - if (config === undefined) { - console.error("Couldn't find webClientConfig. Cannot get public key for captcha."); - } - else { - public_key = webClientConfig.recaptcha_public_key; - if (public_key === undefined) { - console.error("No public key defined for captcha!") - } + var public_key = window.webClientConfig.recaptcha_public_key; + if (public_key === undefined) { + console.error("No public key defined for captcha!") + return; } Recaptcha.create(public_key, "regcaptcha", |