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

This commit is contained in:
Weblate 2018-07-23 13:31:18 +00:00
commit 3d3ff6cc00

View file

@ -117,8 +117,9 @@ export default class AppTile extends React.Component {
const params = qs.parse(u.query);
// Append widget ID to query parameters
params.widgetId = this.props.id;
// Append current / parent URL
params.parentUrl = window.location.href;
// Append current / parent URL, minus the hash because that will change when
// we view a different room (ie. may change for persistent widgets)
params.parentUrl = window.location.href.split('#', 2)[0];
u.search = undefined;
u.query = params;