Merge branch 'develop' into matthew/preview_urls

src/components/views/rooms/MemberInfo.js

@@ -448,6 +448,20 @@ module.exports = React.createClass({
         });
     },
 
+    onMemberAvatarClick: function () {
+        var avatarUrl = this.props.member.user.avatarUrl;
+        if(!avatarUrl) return;
+        
+        var httpUrl = MatrixClientPeg.get().mxcUrlToHttp(avatarUrl);
+        var ImageView = sdk.getComponent("elements.ImageView");
+        var params = {
+            src: httpUrl,
+            name: this.props.member.name
+        };
+
+        Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
+    },
+
     render: function() {
         var startChat, kickButton, banButton, muteButton, giveModButton, spinner;
         if (this.props.member.userId !== MatrixClientPeg.get().credentials.userId) {
@@ -508,7 +522,7 @@ module.exports = React.createClass({
             <div className="mx_MemberInfo">
                 <img className="mx_MemberInfo_cancel" src="img/cancel.svg" width="18" height="18" onClick={this.onCancel}/>
                 <div className="mx_MemberInfo_avatar">
-                    <MemberAvatar member={this.props.member} width={48} height={48} />
+                    <MemberAvatar onClick={this.onMemberAvatarClick} member={this.props.member} width={48} height={48} />
                 </div>
 
                 <h2>{ this.props.member.name }</h2>

src/components/views/rooms/MessageComposer.js

@@ -17,6 +17,7 @@ var React = require('react');
 
 var CallHandler = require('../../../CallHandler');
 var MatrixClientPeg = require('../../../MatrixClientPeg');
+var Modal = require('../../../Modal');
 var sdk = require('../../../index');
 var dis = require('../../../dispatcher');
 
@@ -47,11 +48,40 @@ module.exports = React.createClass({
 
     onUploadFileSelected: function(ev) {
         var files = ev.target.files;
-        // MessageComposer shouldn't have to rely on its parent passing in a callback to upload a file
-        if (files && files.length > 0) {
-            this.props.uploadFile(files[0]);
+
+        var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        var TintableSvg = sdk.getComponent("elements.TintableSvg");
+
+        var fileList = [];
+        for(var i=0; i<files.length; i++) {
+            fileList.push(<li>
+                <TintableSvg src="img/files.svg" width="16" height="16" /> {files[i].name}
+            </li>);
         }
-        this.refs.uploadInput.value = null;
+
+        Modal.createDialog(QuestionDialog, {
+            title: "Upload Files",
+            description: (
+                <div>
+                    <p>Are you sure you want upload the following files?</p>
+                    <ul style={{listStyle: 'none', textAlign: 'left'}}>
+                        {fileList}
+                    </ul>
+                </div>
+            ),
+            onFinished: (shouldUpload) => {
+                if(shouldUpload) {
+                    // MessageComposer shouldn't have to rely on its parent passing in a callback to upload a file
+                    if (files) {
+                        for(var i=0; i<files.length; i++) {
+                            this.props.uploadFile(files[i]);
+                        }
+                    }
+                }
+
+                this.refs.uploadInput.value = null;
+            }
+        });
     },
 
     onHangupClick: function() {
@@ -130,6 +160,7 @@ module.exports = React.createClass({
                     <TintableSvg src="img/upload.svg" width="19" height="24"/>
                     <input ref="uploadInput" type="file"
                         style={uploadInputStyle}
+                        multiple
                         onChange={this.onUploadFileSelected} />
                 </div>
             );