Merge branch 'master' into vector

skins/base/views/templates/Login.js

@@ -31,6 +31,24 @@ module.exports = React.createClass({
     displayName: 'Login',
     mixins: [LoginController],
 
+    getHsUrl: function() {
+        return this.refs.serverConfig.getHsUrl();
+    },
+
+    getIsUrl: function() {
+        return this.refs.serverConfig.getIsUrl();
+    },
+
+    /**
+     * Gets the form field values for the current login stage
+     */
+    getFormVals: function() {
+        return {
+            'username': this.refs.user.getDOMNode().value,
+            'password': this.refs.pass.getDOMNode().value
+        };
+    },
+
     componentForStep: function(step) {
         switch (step) {
             case 'choose_hs':

src/controllers/templates/Login.js

@@ -41,12 +41,12 @@ module.exports = {
     onHSChosen: function(ev) {
         ev.preventDefault();
         MatrixClientPeg.replaceUsingUrls(
-            this.refs.serverConfig.getHsUrl(),
+            this.getHsUrl(),
-            this.refs.serverConfig.getIsUrl()
+            this.getIsUrl()
         );
         this.setState({
-            hs_url: this.refs.serverConfig.getHsUrl(),
+            hs_url: this.getHsUrl(),
-            is_url: this.refs.serverConfig.getIsUrl()
+            is_url: this.getIsUrl()
         });
         this.setStep("fetch_stages");
         var cli = MatrixClientPeg.get();
@@ -69,9 +69,12 @@ module.exports = {
         ev.preventDefault();
         this.setState({busy: true});
         var that = this;
+
+        var formVals = this.getFormVals();
+
         MatrixClientPeg.get().login('m.login.password', {
-            'user': that.refs.user.getDOMNode().value,
+            'user': formVals.username,
-            'password': that.refs.pass.getDOMNode().value
+            'password': formVals.password
         }).done(function(data) {
             // XXX: we assume this means we're logged in, but there could be a next stage
             MatrixClientPeg.replace(Matrix.createClient({