Merge branch 'develop' into matthew/slate

src/components/views/elements/TagTile.js

@@ -21,7 +21,7 @@ import { MatrixClient } from 'matrix-js-sdk';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import { isOnlyCtrlOrCmdIgnoreShiftKeyEvent } from '../../../Keyboard';
-import ContextualMenu from '../../structures/ContextualMenu';
+import * as ContextualMenu from '../../structures/ContextualMenu';
 
 import FlairStore from '../../../stores/FlairStore';
 import GroupStore from '../../../stores/GroupStore';

src/components/views/globals/CookieBar.js

@@ -0,0 +1,78 @@
+/*
+Copyright 2018 New Vector 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 PropTypes from 'prop-types';
+import dis from '../../../dispatcher';
+import { _t } from '../../../languageHandler';
+import sdk from '../../../index';
+
+export default class CookieBar extends React.Component {
+    static propTypes = {
+        policyUrl: PropTypes.string,
+    }
+
+    constructor() {
+        super();
+    }
+
+    onAccept() {
+        dis.dispatch({
+            action: 'accept_cookies',
+        });
+    }
+
+    onReject() {
+        dis.dispatch({
+            action: 'reject_cookies',
+        });
+    }
+
+    render() {
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+        const toolbarClasses = "mx_MatrixToolbar";
+        return (
+            <div className={toolbarClasses}>
+                <img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="Warning" />
+                <div className="mx_MatrixToolbar_content">
+                    { this.props.policyUrl ? _t(
+                        "Help improve Riot by sending usage data? " +
+                        "This will use a cookie. " +
+                        "(See our <PolicyLink>cookie and privacy policies</PolicyLink>).",
+                        {},
+                        {
+                            // XXX: We need to link to the page that explains our cookies
+                            'PolicyLink': (sub) => <a
+                                    className="mx_MatrixToolbar_link"
+                                    target="_blank"
+                                    href={this.props.policyUrl}
+                                >
+                                    { sub }
+                                </a>
+                            ,
+                        },
+                    ) : _t("Help improve Riot by sending usage data? This will use a cookie.") }
+                </div>
+                <AccessibleButton element='button' className="mx_MatrixToolbar_action" onClick={this.onAccept}>
+                    { _t("Yes please") }
+                </AccessibleButton>
+                <AccessibleButton className="mx_MatrixToolbar_close" onClick={this.onReject}>
+                    <img src="img/cancel.svg" width="18" height="18" />
+                </AccessibleButton>
+            </div>
+        );
+    }
+}

src/components/views/messages/MImageBody.js

@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -140,7 +141,6 @@ export default class extends React.Component {
     }
 
     onImageLoad() {
-        this.fixupHeight();
         this.props.onWidgetLoad();
     }
 
@@ -207,6 +207,7 @@ export default class extends React.Component {
                 });
             }).done();
         }
+        this.fixupHeight();
         this._afterComponentDidMount();
     }
 

src/components/views/messages/MStickerBody.js

@@ -40,7 +40,6 @@ export default class MStickerBody extends MImageBody {
     }
 
     _onImageLoad() {
-        this.fixupHeight();
         this.setState({
             placeholderClasses: 'mx_MStickerBody_placeholder_invisible',
         });

src/components/views/messages/TextualBody.js

@@ -32,7 +32,7 @@ import SdkConfig from '../../../SdkConfig';
 import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import ContextualMenu from '../../structures/ContextualMenu';
+import * as ContextualMenu from '../../structures/ContextualMenu';
 import SettingsStore from "../../../settings/SettingsStore";
 import PushProcessor from 'matrix-js-sdk/lib/pushprocessor';
 import ReplyThread from "../elements/ReplyThread";