Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into erikj/room_editing

src/CallHandler.js

@@ -54,6 +54,9 @@ limitations under the License.
  */
 
 var MatrixClientPeg = require("./MatrixClientPeg");
+var Modal = require("./Modal");
+var ComponentBroker = require('./ComponentBroker');
+var ErrorDialog = ComponentBroker.get("organisms/ErrorDialog");
 var Matrix = require("matrix-js-sdk");
 var dis = require("./dispatcher");
 
@@ -154,7 +157,12 @@ dis.register(function(payload) {
                 console.error("Room %s does not exist.", payload.room_id);
                 return;
             }
-            if (room.getJoinedMembers().length !== 2) {
+            var members = room.getJoinedMembers();
+            if (members.length !== 2) {
+                var text = members.length === 1 ? "yourself." : "more than 2 people.";
+                Modal.createDialog(ErrorDialog, {
+                    description: "You cannot place a call with " + text
+                });
                 console.error(
                     "Fail: There are %s joined members in this room, not 2.",
                     room.getJoinedMembers().length

src/ComponentBroker.js

@@ -110,4 +110,5 @@ require('../skins/base/views/molecules/voip/MCallAnswerTile');
 require('../skins/base/views/molecules/voip/MCallHangupTile');
 require('../skins/base/views/molecules/EventAsTextTile');
 require('../skins/base/views/molecules/MemberInfo');
+require('../skins/base/views/organisms/ErrorDialog');
 }

src/Modal.js

@@ -44,6 +44,8 @@ module.exports = {
             if (props && props.onFinished) props.onFinished.apply(arguments);
         };
 
+        // FIXME: If a dialog uses getDefaultProps it clobbers the onFinished
+        // property set here so you can't close the dialog from a button click!
         var dialog = (
             <div className="mx_Dialog_Wrapper">
                 <div className="mx_Dialog">

src/SlashCommands.js

@@ -100,22 +100,18 @@ var commands = {
                 else {
                     // attempt to join this alias.
                     return success(
-                        MatrixClientPeg.get().joinRoom(room_alias).done(
+                        MatrixClientPeg.get().joinRoom(room_alias).then(
                         function(room) {
                             dis.dispatch({
                                 action: 'view_room',
                                 room_id: room.roomId
                             });
-                        }, function(err) {
-                            console.error(
-                                "Failed to join room: %s", JSON.stringify(err)
-                            );
                         })
                     );
                 }
             }
         }
-        return reject("Usage: /join <room_alias> [NOT IMPLEMENTED]");
+        return reject("Usage: /join <room_alias>");
     },
 
     // Kick a user from the room with an optional reason

src/controllers/molecules/MessageComposer.js

@@ -18,6 +18,9 @@ limitations under the License.
 
 var MatrixClientPeg = require("../../MatrixClientPeg");
 var SlashCommands = require("../../SlashCommands");
+var Modal = require("../../Modal");
+var ComponentBroker = require('../../ComponentBroker');
+var ErrorDialog = ComponentBroker.get("organisms/ErrorDialog");
 
 var dis = require("../../dispatcher");
 var KeyCode = {
@@ -196,10 +199,18 @@ module.exports = {
                     console.log("Command success.");
                 }, function(err) {
                     console.error("Command failure: %s", err);
+                    Modal.createDialog(ErrorDialog, {
+                        title: "Server Error",
+                        description: err.message
+                    });
                 });
             }
             else if (cmd.error) {
                 console.error(cmd.error);
+                Modal.createDialog(ErrorDialog, {
+                    title: "Command Error",
+                    description: cmd.error
+                });
             }
             return;
         }