Merge branch 'develop' into matthew/status

src/components/views/dialogs/CreateGroupDialog.js

@@ -137,16 +137,19 @@ export default React.createClass({
                             <div className="mx_CreateGroupDialog_label">
                                 <label htmlFor="groupid">{ _t('Community ID') }</label>
                             </div>
-                            <div>
+                            <div className="mx_CreateGroupDialog_input_group">
-                                <span>+</span>
+                                <span className="mx_CreateGroupDialog_prefix">+</span>
-                                <input id="groupid" className="mx_CreateGroupDialog_input"
+                                <input id="groupid"
+                                    className="mx_CreateGroupDialog_input mx_CreateGroupDialog_input_hasPrefixAndSuffix"
                                     size="32"
                                     placeholder={_t('example')}
                                     onChange={this._onGroupIdChange}
                                     onBlur={this._onGroupIdBlur}
                                     value={this.state.groupId}
                                 />
-                                <span>:{ MatrixClientPeg.get().getDomain() }</span>
+                                <span className="mx_CreateGroupDialog_suffix">
+                                    :{ MatrixClientPeg.get().getDomain() }
+                                </span>
                             </div>
                         </div>
                         <div className="error">

src/components/views/elements/Dropdown.js

@@ -26,11 +26,9 @@ class MenuOption extends React.Component {
         this._onClick = this._onClick.bind(this);
     }
 
-    getDefaultProps() {
+    static defaultProps = {
-        return {
+        disabled: false,
-            disabled: false,
+    };
-        };
-    }
 
     _onMouseEnter() {
         this.props.onMouseEnter(this.props.dropdownKey);

src/components/views/rooms/RoomDetailList.js

@@ -49,6 +49,7 @@ const RoomDetailRow = React.createClass({
         dis.dispatch({
             action: 'view_room',
             room_id: this.props.room.roomId,
+            room_alias: this.props.room.canonicalAlias || (this.props.room.aliases || [])[0],
         });
     },
 

src/stores/FlairStore.js

@@ -48,6 +48,9 @@ class FlairStore extends EventEmitter {
             //      reject: () => {}
             //  }
         };
+        this._usersInFlight = {
+            // This has the same schema as _usersPending
+        };
 
         this._debounceTimeoutID = null;
     }
@@ -125,12 +128,16 @@ class FlairStore extends EventEmitter {
         } catch (err) {
             // Propagate the same error to all usersInFlight
             Object.keys(this._usersInFlight).forEach((userId) => {
+                // The promise should always exist for userId, but do a null-check anyway
+                if (!this._usersInFlight[userId]) return;
                 this._usersInFlight[userId].reject(err);
             });
             return;
         }
         const updatedUserGroups = resp.users;
         Object.keys(this._usersInFlight).forEach((userId) => {
+            // The promise should always exist for userId, but do a null-check anyway
+            if (!this._usersInFlight[userId]) return;
             this._usersInFlight[userId].resolve(updatedUserGroups[userId] || []);
         });
     }