From 435a9cd9e4a8b34cfac824d196152c3e7a18a2e3 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 25 Oct 2015 02:42:41 +0000 Subject: [PATCH] actually use the config file for default HS and IS URLs... --- src/skins/vector/views/templates/Register.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/skins/vector/views/templates/Register.js b/src/skins/vector/views/templates/Register.js index 6db0786ee..24f88b05e 100644 --- a/src/skins/vector/views/templates/Register.js +++ b/src/skins/vector/views/templates/Register.js @@ -25,10 +25,9 @@ var Loader = require("react-loader"); var RegisterController = require('../../../../controllers/templates/Register') -module.exports = React.createClass({ - DEFAULT_HS_URL: 'https://matrix.org', - DEFAULT_IS_URL: 'https://vector.im', +var config = require('../../../../../config.json'); +module.exports = React.createClass({ displayName: 'Register', mixins: [RegisterController], @@ -39,8 +38,8 @@ module.exports = React.createClass({ }, componentWillMount: function() { - this.customHsUrl = this.DEFAULT_HS_URL; - this.customIsUrl = this.DEFAULT_IS_URL; + this.customHsUrl = config.default_hs_url; + this.customIsUrl = config.default_is_url; }, getRegFormVals: function() { @@ -56,7 +55,7 @@ module.exports = React.createClass({ if (this.state.serverConfigVisible) { return this.customHsUrl; } else { - return this.DEFAULT_HS_URL; + return config.default_hs_url; } }, @@ -64,7 +63,7 @@ module.exports = React.createClass({ if (this.state.serverConfigVisible) { return this.customIsUrl; } else { - return this.DEFAULT_IS_URL; + return config.default_is_url; } },