Merge up from develop

package.json

@@ -45,7 +45,7 @@
     "react": "^15.2.1",
     "react-addons-css-transition-group": "^15.2.1",
     "react-dom": "^15.2.1",
-    "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#dbf0abf",
+    "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
     "sanitize-html": "^1.11.1",
     "velocity-vector": "vector-im/velocity#059e3b2",
     "whatwg-fetch": "^1.0.0"

src/components/structures/ScrollPanel.js

@@ -540,7 +540,6 @@ module.exports = React.createClass({
         // it's not obvious why we have a separate div and ol anyway.
         return (<GeminiScrollbar autoshow={true} ref="geminiPanel"
                 onScroll={this.onScroll} onResize={this.onResize}
-                relayoutOnUpdate={false}
                 className={this.props.className} style={this.props.style}>
                     <div className="mx_RoomView_messageListWrapper">
                         <ol ref="itemlist" className="mx_RoomView_MessageList" aria-live="polite">

src/components/structures/UserSettings.js

@@ -463,7 +463,6 @@ module.exports = React.createClass({
                 <SimpleRoomHeader title="Settings" onCancelClick={ this.props.onClose }/>
 
                 <GeminiScrollbar className="mx_UserSettings_body"
-                                 relayoutOnUpdate={false}
                                  autoshow={true}>
 
                 <h3>Profile</h3>

src/components/views/avatars/BaseAvatar.js

@@ -133,32 +133,36 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var name = this.props.name;
-
         var imageUrl = this.state.imageUrls[this.state.urlsIndex];
 
+        const {
+            name, idName, title, url, urls, width, height, resizeMethod,
+            defaultToInitialLetter,
+            ...otherProps
+        } = this.props;
+
         if (imageUrl === this.state.defaultImageUrl) {
-            var initialLetter = emojifyText(this._getInitialLetter(this.props.name));
+            var initialLetter = emojifyText(this._getInitialLetter(name));
             return (
-                <span className="mx_BaseAvatar" {...this.props}>
+                <span className="mx_BaseAvatar" {...otherProps}>
                     <span className="mx_BaseAvatar_initial" aria-hidden="true"
-                            style={{ fontSize: (this.props.width * 0.65) + "px",
-                                    width: this.props.width + "px",
-                                    lineHeight: this.props.height + "px" }}
+                            style={{ fontSize: (width * 0.65) + "px",
+                                    width: width + "px",
+                                    lineHeight: height + "px" }}
                             dangerouslySetInnerHTML={initialLetter}>
                     </span>
                     <img className="mx_BaseAvatar_image" src={imageUrl}
-                        alt="" title={this.props.title} onError={this.onError}
-                        width={this.props.width} height={this.props.height} />
+                        alt="" title={title} onError={this.onError}
+                        width={width} height={height} />
                 </span>
             );
         }
         return (
             <img className="mx_BaseAvatar mx_BaseAvatar_image" src={imageUrl}
                 onError={this.onError}
-                width={this.props.width} height={this.props.height}
-                title={this.props.title} alt=""
-                {...this.props} />
+                width={width} height={height}
+                title={title} alt=""
+                {...otherProps} />
         );
     }
 });

src/components/views/avatars/RoomAvatar.js

@@ -126,11 +126,13 @@ module.exports = React.createClass({
     render: function() {
         var BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
 
-        var roomName = this.props.room ? this.props.room.name : this.props.oobData.name;
+        var {room, oobData, ...otherProps} = this.props;
+
+        var roomName = room ? room.name : oobData.name;
 
         return (
-            <BaseAvatar {...this.props} name={roomName}
-                idName={this.props.room ? this.props.room.roomId : null}
+            <BaseAvatar {...otherProps} name={roomName}
+                idName={room ? room.roomId : null}
                 urls={this.state.urls} />
         );
     }

src/components/views/rooms/MemberList.js

@@ -521,7 +521,6 @@ module.exports = React.createClass({
             <div className="mx_MemberList">
                     {inviteMemberListSection}
                     <GeminiScrollbar autoshow={true}
-                                     relayoutOnUpdate={false}
                                      className="mx_MemberList_joined mx_MemberList_outerWrapper">
                         <TruncatedList className="mx_MemberList_wrapper" truncateAt={this.state.truncateAt}
                                 createOverflowElement={this._createOverflowTile}>

src/components/views/rooms/RoomList.js

@@ -325,7 +325,6 @@ module.exports = React.createClass({
 
         return (
             <GeminiScrollbar className="mx_RoomList_scrollbar"
-                 relayoutOnUpdate={false}
                  autoshow={true} onScroll={ self._repositionTooltips } ref="gemscroll">
             <div className="mx_RoomList">
                 <RoomSubList list={ self.state.lists['im.vector.fake.invite'] }

src/components/views/rooms/SearchableEntityList.js

@@ -179,7 +179,6 @@ var SearchableEntityList = React.createClass({
             }
             list = (
                 <GeminiScrollbar autoshow={true}
-                                 relayoutOnUpdate={false}
                                  className="mx_SearchableEntityList_listWrapper">
                     { list }
                 </GeminiScrollbar>