From 68d408bfff47ced5f83c93414aabcafb4553d046 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 5 Aug 2015 11:37:52 +0100 Subject: [PATCH] Wire up popup to the "What does this mean?" link --- skins/base/views/molecules/ServerConfig.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/skins/base/views/molecules/ServerConfig.js b/skins/base/views/molecules/ServerConfig.js index c533cf94..56241a2a 100644 --- a/skins/base/views/molecules/ServerConfig.js +++ b/skins/base/views/molecules/ServerConfig.js @@ -17,6 +17,10 @@ limitations under the License. 'use strict'; var React = require('react'); +var Modal = require('../../../../src/Modal'); +var ComponentBroker = require('../../../../src/ComponentBroker'); + +var ErrorDialog = ComponentBroker.get('organisms/ErrorDialog'); var ServerConfigController = require("../../../../src/controllers/molecules/ServerConfig"); @@ -24,6 +28,15 @@ module.exports = React.createClass({ displayName: 'ServerConfig', mixins: [ServerConfigController], + showHelpPopup: function() { + Modal.createDialog(ErrorDialog, { + title: 'Custom Server Options', + description: "You can use the custom server options to log into other Matrix servers by specifying a different Home server URL. This allows you to use Vector with an existing Matrix account on a different Home server. You can also set a cutom Identity server but this will affect people ability to find you if you use a server in a group other than tha main Matrix.org group.", + button: "Dismiss", + focus: true + }); + }, + render: function() { return (
@@ -31,7 +44,7 @@ module.exports = React.createClass({ - What does this mean? + What does this mean?
); }