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

skins/base/views/organisms/ErrorDialog.js

@@ -0,0 +1,71 @@
+/*
+Copyright 2015 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+'use strict';
+
+/*
+ * Usage: 
+ * Modal.createDialog(ErrorDialog, {
+ *   title: "some text", (default: "Error")
+ *   description: "some more text",
+ *   button: "Button Text",
+ *   onClose: someFunction,
+ *   focus: true|false (default: true)
+ * });
+ */
+
+var React = require('react');
+
+module.exports = React.createClass({
+    displayName: 'ErrorDialog',
+
+    // can't use getDefaultProps, see Modal.js
+    componentWillMount: function() {
+        if (!this.props.title) {
+            this.props.title = "Error";
+        }
+        if (!this.props.description) {
+            this.props.description = "An error has occurred.";
+        }
+        if (!this.props.button) {
+            this.props.button = "OK";
+        }
+        if (this.props.focus === undefined) {
+            this.props.focus = true;
+        }
+        if (!this.props.onClose) {
+            var self = this;
+            this.props.onClose = function() {
+                self.props.onFinished();
+            };
+        }
+    },
+
+    render: function() {
+        return (
+            <div className="mx_ErrorDialog">
+                <div className="mx_ErrorDialogTitle">
+                    {this.props.title}
+                </div>
+                {this.props.description}<br />
+                <button onClick={this.props.onClose} autoFocus={this.props.focus}>
+                    {this.props.button}
+                </button>
+            </div>
+        );
+    }
+});
+

skins/base/views/organisms/MemberList.js

@@ -30,6 +30,18 @@ module.exports = React.createClass({
     displayName: 'MemberList',
     mixins: [MemberListController],
 
+    // FIXME: combine this more nicely with the MemberInfo positioning stuff...
+    onMemberListScroll: function(ev) {
+        if (this.refs.memberListScroll) {
+            var memberListScroll = this.refs.memberListScroll.getDOMNode();
+            // offset the current MemberInfo bubble
+            var memberInfo = document.getElementsByClassName("mx_MemberInfo")[0];
+            if (memberInfo) {
+                memberInfo.style.top = (memberInfo.parentElement.offsetTop - memberListScroll.scrollTop) + "px";
+            }
+        }
+    },
+
     makeMemberTiles: function() {
         var self = this;
         return Object.keys(self.state.memberDict).map(function(userId) {
@@ -71,7 +83,7 @@ module.exports = React.createClass({
                 <div className="mx_MemberList_chevron">
                     <img src="img/chevron.png" width="24" height="13"/>
                 </div>
-                <div className="mx_MemberList_border">
+                <div className="mx_MemberList_border" ref="memberListScroll" onScroll={ this.onMemberListScroll }>
                     <h2>Members</h2>
                     <div className="mx_MemberList_wrapper">
                         {this.makeMemberTiles()}

skins/base/views/organisms/RoomView.js

@@ -179,7 +179,7 @@ module.exports = React.createClass({
                         <CallView room={this.state.room}/>
                         { roomEdit }
                     </div>
-                    <div ref="messageWrapper" className="mx_RoomView_messagePanel" onScroll={this.onMessageListScroll}>
+                    <div ref="messageWrapper" className="mx_RoomView_messagePanel" onScroll={ this.onMessageListScroll }>
                         <div className="mx_RoomView_messageListWrapper">
                             <div className="mx_RoomView_MessageList" aria-live="polite">
                                 <div className={scrollheader_classes}>

skins/base/views/organisms/UserSettings.js

@@ -25,7 +25,7 @@ var ChangePassword = ComponentBroker.get('molecules/ChangePassword');
 var LogoutPrompt = ComponentBroker.get('organisms/LogoutPrompt');
 var Loader = require("react-loader");
 
-var Modal = require("../../../../src/Modal")
+var Modal = require("../../../../src/Modal");
 
 module.exports = React.createClass({
     displayName: 'UserSettings',