imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branches 'develop' and 't3chguy/hide_tray_icon' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/hide_tray_icon

Browse source
This commit is contained in:
Michael Telatynski 2019-10-30 14:15:09 +00:00
commit 46e7e1e81a
12 changed files with 66 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/components/views/elements/AppTile.js
View file

@ -190,9 +190,20 @@ export default class AppTile extends React.Component {
// TODO: Pick the right manager for the widget
const defaultManager = managers.getPrimaryManager();
if (!WidgetUtils.isScalarUrl(defaultManager.apiUrl)) {
console.warn('Non-scalar manager, not setting scalar token!', url);
this.setState({
error: null,
widgetUrl: this._addWurlParams(this.props.url),
initialising: false,
});
return;
}
// Fetch the token before loading the iframe as we need it to mangle the URL
if (!this._scalarClient) {
this._scalarClient = managers.getPrimaryManager().getScalarClient();
this._scalarClient = defaultManager.getScalarClient();
}
this._scalarClient.getScalarToken().done((token) => {
// Append scalar_token as a query param if not already present

6
src/components/views/rooms/EventTile.js
View file

@ -495,6 +495,12 @@ module.exports = createReactClass({
return null;
}
const eventId = this.props.mxEvent.getId();
if (!eventId) {
// XXX: Temporary diagnostic logging for https://github.com/vector-im/riot-web/issues/11120
console.error("EventTile attempted to get relations for an event without an ID");
// Use event's special `toJSON` method to log key data.
console.log(JSON.stringify(this.props.mxEvent, null, 4));
}
return this.props.getRelationsForEvent(eventId, "m.annotation", "m.reaction");
},

2
src/components/views/rooms/RoomTile.js
View file

@ -389,6 +389,8 @@ module.exports = createReactClass({
ariaLabel += " " + _t("%(count)s unread messages.", { count: notificationCount });
} else if (mentionBadges && !isInvite) {
ariaLabel += " " + _t("Unread mentions.");
} else if (this.props.unread) {
ariaLabel += " " + _t("Unread messages.");
}
return <AccessibleButton tabIndex="0"