Merge remote-tracking branch 'origin/develop' into dbkr/irc_links

src/RichText.js

@@ -273,11 +273,15 @@ export function attachImmutableEntitiesToEmoji(editorState: EditorState): Editor
     });
 
     if (!newContentState.equals(contentState)) {
-        return EditorState.push(
+        const oldSelection = editorState.getSelection();
+        editorState = EditorState.push(
             editorState,
             newContentState,
             'convert-to-immutable-emojis',
         );
+        // this is somewhat of a hack, we're undoing selection changes caused above
+        // it would be better not to make those changes in the first place
+        editorState = EditorState.forceSelection(editorState, oldSelection);
     }
 
     return editorState;

src/component-index.js

@@ -58,6 +58,7 @@ module.exports.components['views.dialogs.SetDisplayNameDialog'] = require('./com
 module.exports.components['views.dialogs.TextInputDialog'] = require('./components/views/dialogs/TextInputDialog');
 module.exports.components['views.elements.AddressSelector'] = require('./components/views/elements/AddressSelector');
 module.exports.components['views.elements.AddressTile'] = require('./components/views/elements/AddressTile');
+module.exports.components['views.elements.DeviceVerifyButtons'] = require('./components/views/elements/DeviceVerifyButtons');
 module.exports.components['views.elements.EditableText'] = require('./components/views/elements/EditableText');
 module.exports.components['views.elements.EditableTextContainer'] = require('./components/views/elements/EditableTextContainer');
 module.exports.components['views.elements.EmojiText'] = require('./components/views/elements/EmojiText');

src/components/views/dialogs/EncryptedEventDialog.js

@@ -152,12 +152,12 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var MemberDeviceInfo = sdk.getComponent('rooms.MemberDeviceInfo');
+        var DeviceVerifyButtons = sdk.getComponent('elements.DeviceVerifyButtons');
 
         var buttons = null;
         if (this.state.device) {
             buttons = (
-                <MemberDeviceInfo hideInfo={true} device={ this.state.device }
+                <DeviceVerifyButtons device={ this.state.device }
                     userId={ this.props.event.getSender() }
                 />
             );

src/components/views/elements/DeviceVerifyButtons.js

@@ -0,0 +1,131 @@
+/*
+Copyright 2016 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.
+*/
+
+import React from 'react';
+import MatrixClientPeg from '../../../MatrixClientPeg';
+import sdk from '../../../index';
+import Modal from '../../../Modal';
+
+export default React.createClass({
+    displayName: 'DeviceVerifyButtons',
+
+    propTypes: {
+        userId: React.PropTypes.string.isRequired,
+        device: React.PropTypes.object.isRequired,
+    },
+
+    onVerifyClick: function() {
+        var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        Modal.createDialog(QuestionDialog, {
+            title: "Verify device",
+            description: (
+                <div>
+                    <p>
+                        To verify that this device can be trusted, please contact its
+                        owner using some other means (e.g. in person or a phone call)
+                        and ask them whether the key they see in their User Settings
+                        for this device matches the key below:
+                    </p>
+                    <div className="mx_UserSettings_cryptoSection">
+                        <ul>
+                            <li><label>Device name:</label> <span>{ this.props.device.getDisplayName() }</span></li>
+                            <li><label>Device ID:</label>   <span><code>{ this.props.device.deviceId}</code></span></li>
+                            <li><label>Device key:</label>  <span><code><b>{ this.props.device.getFingerprint() }</b></code></span></li>
+                        </ul>
+                    </div>
+                    <p>
+                        If it matches, press the verify button below.
+                        If it doesnt, then someone else is intercepting this device
+                        and you probably want to press the block button instead.
+                    </p>
+                    <p>
+                        In future this verification process will be more sophisticated.
+                    </p>
+                </div>
+            ),
+            button: "I verify that the keys match",
+            onFinished: confirm=>{
+                if (confirm) {
+                    MatrixClientPeg.get().setDeviceVerified(
+                        this.props.userId, this.props.device.deviceId, true
+                    );
+                }
+            },
+        });
+    },
+
+    onUnverifyClick: function() {
+        MatrixClientPeg.get().setDeviceVerified(
+            this.props.userId, this.props.device.deviceId, false
+        );
+    },
+
+    onBlockClick: function() {
+        MatrixClientPeg.get().setDeviceBlocked(
+            this.props.userId, this.props.device.deviceId, true
+        );
+    },
+
+    onUnblockClick: function() {
+        MatrixClientPeg.get().setDeviceBlocked(
+            this.props.userId, this.props.device.deviceId, false
+        );
+    },
+
+    render: function() {
+        var blockButton = null, verifyButton = null;
+
+        if (this.props.device.isBlocked()) {
+            blockButton = (
+                <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_unblock"
+                  onClick={this.onUnblockClick}>
+                    Unblock
+                </button>
+            );
+        } else {
+            blockButton = (
+                <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_block"
+                  onClick={this.onBlockClick}>
+                    Block
+                </button>
+            );
+        }
+
+        if (this.props.device.isVerified()) {
+            verifyButton = (
+                <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_unverify"
+                  onClick={this.onUnverifyClick}>
+                    Unverify
+                </button>
+            );
+        } else {
+            verifyButton = (
+                <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_verify"
+                  onClick={this.onVerifyClick}>
+                    Verify
+                </button>
+            );
+        }
+
+        // mx_MemberDeviceInfo because the vector's CSS on EncryptedEventDialog is awful
+        return (
+            <div className="mx_MemberDeviceInfo mx_DeviceVerifyButtons" >
+                { verifyButton }
+                { blockButton }
+            </div>
+        );
+    },
+});

src/components/views/rooms/Autocomplete.js

@@ -17,7 +17,8 @@ export default class Autocomplete extends React.Component {
         super(props);
 
         this.completionPromise = null;
-        this.onConfirm = this.onConfirm.bind(this);
+        this.hide = this.hide.bind(this);
+        this.onCompletionClicked = this.onCompletionClicked.bind(this);
 
         this.state = {
             // list of completionResults, each containing completions
@@ -137,6 +138,10 @@ export default class Autocomplete extends React.Component {
         e.preventDefault();
 
         // selectionOffset = 0, so we don't end up completing when autocomplete is hidden
+        this.hide();
+    }
+
+    hide() {
         this.setState({hide: true, selectionOffset: 0});
     }
 
@@ -152,16 +157,13 @@ export default class Autocomplete extends React.Component {
         return done.promise;
     }
 
-    /** called from MessageComposerInput
-     * @returns {boolean} whether confirmation was handled
-     */
-    onConfirm(): boolean {
+    onCompletionClicked(): boolean {
         if (this.countCompletions() === 0 || this.state.selectionOffset === COMPOSER_SELECTED) {
             return false;
         }
 
-        let selectedCompletion = this.state.completionList[this.state.selectionOffset - 1];
-        this.props.onConfirm(selectedCompletion.range, selectedCompletion.completion);
+        this.props.onConfirm(this.state.completionList[this.state.selectionOffset - 1]);
+        this.hide();
 
         return true;
     }
@@ -199,7 +201,7 @@ export default class Autocomplete extends React.Component {
                 let onMouseOver = () => this.setSelection(componentPosition);
                 let onClick = () => {
                     this.setSelection(componentPosition);
-                    this.onConfirm();
+                    this.onCompletionClicked();
                 };
 
                 return React.cloneElement(completion.component, {

src/components/views/rooms/MemberDeviceInfo.js

@@ -15,152 +15,48 @@ limitations under the License.
 */
 
 import React from 'react';
-import MatrixClientPeg from '../../../MatrixClientPeg';
 import sdk from '../../../index';
-import Modal from '../../../Modal';
 
 export default class MemberDeviceInfo extends React.Component {
-    constructor(props) {
-        super(props);
-        this.onVerifyClick = this.onVerifyClick.bind(this);
-        this.onUnverifyClick = this.onUnverifyClick.bind(this);
-        this.onBlockClick = this.onBlockClick.bind(this);
-        this.onUnblockClick = this.onUnblockClick.bind(this);
-    }
-
-    onVerifyClick() {
-        var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-        Modal.createDialog(QuestionDialog, {
-            title: "Verify device",
-            description: (
-                <div>
-                    <p>
-                        To verify that this device can be trusted, please contact its
-                        owner using some other means (e.g. in person or a phone call)
-                        and ask them whether the key they see in their User Settings
-                        for this device matches the key below:
-                    </p>
-                    <div className="mx_UserSettings_cryptoSection">
-                        <ul>
-                            <li><label>Device name:</label> <span>{ this.props.device.getDisplayName() }</span></li>
-                            <li><label>Device ID:</label>   <span><code>{ this.props.device.deviceId}</code></span></li>
-                            <li><label>Device key:</label>  <span><code><b>{ this.props.device.getFingerprint() }</b></code></span></li>
-                        </ul>
-                    </div>
-                    <p>
-                        If it matches, press the verify button below.
-                        If it doesn't, then someone else is intercepting this device
-                        and you probably want to press the block button instead.
-                    </p>
-                    <p>
-                        In future this verification process will be more sophisticated.
-                    </p>
-                </div>
-            ),
-            button: "I verify that the keys match",
-            onFinished: confirm=>{
-                if (confirm) {
-                    MatrixClientPeg.get().setDeviceVerified(
-                        this.props.userId, this.props.device.deviceId, true
-                    );
-                }
-            },
-        });
-    }
-
-    onUnverifyClick() {
-        MatrixClientPeg.get().setDeviceVerified(
-            this.props.userId, this.props.device.deviceId, false
-        );
-    }
-
-    onBlockClick() {
-        MatrixClientPeg.get().setDeviceBlocked(
-            this.props.userId, this.props.device.deviceId, true
-        );
-    }
-
-    onUnblockClick() {
-        MatrixClientPeg.get().setDeviceBlocked(
-            this.props.userId, this.props.device.deviceId, false
-        );
-    }
-
     render() {
-        if (!this.props.device) {
-            return <div className="mx_MemberDeviceInfo"/>;
-        }
+        var indicator = null;
+        var DeviceVerifyButtons = sdk.getComponent('elements.DeviceVerifyButtons');
 
-        var indicator = null, blockButton = null, verifyButton = null;
         if (this.props.device.isBlocked()) {
-            blockButton = (
-                <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_unblock"
-                  onClick={this.onUnblockClick}>
-                    Unblock
-                </button>
-            );
-        } else {
-            blockButton = (
-                <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_block"
-                  onClick={this.onBlockClick}>
-                    Block
-                </button>
-            );
-        }
-
-        if (this.props.device.isVerified()) {
-            verifyButton = (
-                <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_unverify"
-                  onClick={this.onUnverifyClick}>
-                    Unverify
-                </button>
-            );
-        } else {
-            verifyButton = (
-                <button className="mx_MemberDeviceInfo_textButton mx_MemberDeviceInfo_verify"
-                  onClick={this.onVerifyClick}>
-                    Verify
-                </button>
-            );
-        }
-
-        if (!this.props.hideInfo) {
-            if (this.props.device.isBlocked()) {
-                indicator = (
+            indicator = (
                     <div className="mx_MemberDeviceInfo_blocked">
-                        <img src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} alt="Blocked"/>
+                    <img src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} alt="Blocked"/>
                     </div>
-                );
-            } else if (this.props.device.isVerified()) {
-                indicator = (
+            );
+        } else if (this.props.device.isVerified()) {
+            indicator = (
                     <div className="mx_MemberDeviceInfo_verified">
-                        <img src="img/e2e-verified.svg" width="10" height="12" alt="Verified"/>
+                    <img src="img/e2e-verified.svg" width="10" height="12" alt="Verified"/>
                     </div>
-                );
-            } else {
-                indicator = (
+            );
+        } else {
+            indicator = (
                     <div className="mx_MemberDeviceInfo_unverified">
-                        <img src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }} alt="Unverified"/>
+                    <img src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }} alt="Unverified"/>
                     </div>
-                );
-            }
-
-            var deviceName = this.props.device.ambiguous ?
-                             (this.props.device.getDisplayName() ? this.props.device.getDisplayName() : "") + " (" + this.props.device.deviceId + ")" :
-                             this.props.device.getDisplayName();
-
-            var info = (
-                <div className="mx_MemberDeviceInfo_deviceInfo">
-                    <div className="mx_MemberDeviceInfo_deviceId">{deviceName}{indicator}</div>
-                </div>
             );
         }
 
+        var deviceName = this.props.device.ambiguous ?
+            (this.props.device.getDisplayName() ? this.props.device.getDisplayName() : "") + " (" + this.props.device.deviceId + ")" :
+            this.props.device.getDisplayName();
+
+        // add the deviceId as a titletext to help with debugging
         return (
-            <div className="mx_MemberDeviceInfo">
-                { info }
-                { verifyButton }
-                { blockButton }
+            <div className="mx_MemberDeviceInfo"
+                    title={"device id: " + this.props.device.deviceId} >
+                <div className="mx_MemberDeviceInfo_deviceInfo">
+                    <div className="mx_MemberDeviceInfo_deviceId">
+                        {deviceName}
+                        {indicator}
+                    </div>
+                </div>
+                <DeviceVerifyButtons userId={this.props.userId} device={this.props.device} />
             </div>
         );
     }
@@ -170,5 +66,4 @@ MemberDeviceInfo.displayName = 'MemberDeviceInfo';
 MemberDeviceInfo.propTypes = {
     userId: React.PropTypes.string.isRequired,
     device: React.PropTypes.object.isRequired,
-    hideInfo: React.PropTypes.bool,
 };

src/components/views/rooms/MessageComposer.js

@@ -178,7 +178,7 @@ export default class MessageComposer extends React.Component {
 
     _tryComplete(): boolean {
         if (this.refs.autocomplete) {
-            return this.refs.autocomplete.onConfirm();
+            return this.refs.autocomplete.onCompletionClicked();
         }
         return false;
     }

src/components/views/rooms/MessageComposerInput.js

@@ -567,6 +567,8 @@ export default class MessageComposerInput extends React.Component {
             editorState: this.createEditorState(),
         });
 
+        this.autocomplete.hide();
+
         return true;
     }