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

Set page title from widget data, if available.

Browse source
This commit is contained in:
Richard Lewis 2017-12-08 15:12:48 +00:00
parent 3206527d73
commit 20917e1a07
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,7 +79,7 @@ export default React.createClass({
hasPermissionToLoad: hasPermissionToLoad === 'true' || newProps.userId === newProps.creatorUserId, hasPermissionToLoad: hasPermissionToLoad === 'true' || newProps.userId === newProps.creatorUserId,
error: null, error: null,
deleting: false, deleting: false,
widgetPageTitle: null, widgetPageTitle: newProps.widgetPageTitle,
}; };
}, },
@ -197,7 +197,10 @@ export default React.createClass({
initialising: false, initialising: false,
}); });
this._updateWidgetTitle(params.url); // Fetch page title from remote content if not already set
if (!this.state.widgetPageTitle) {
this._fetchWidgetTitle(params.url);
}
}, (err) => { }, (err) => {
console.error("Failed to get scalar_token", err); console.error("Failed to get scalar_token", err);
this.setState({ this.setState({
@ -303,7 +306,7 @@ export default React.createClass({
* Set remote content title on AppTile * Set remote content title on AppTile
* @param {string} url Url to check for title * @param {string} url Url to check for title
*/ */
_updateWidgetTitle(url) { _fetchWidgetTitle(url) {
this._scalarClient.getScalarPageTitle(url).then((widgetPageTitle) => { this._scalarClient.getScalarPageTitle(url).then((widgetPageTitle) => {
if (widgetPageTitle) { if (widgetPageTitle) {
this.setState({widgetPageTitle: widgetPageTitle}); this.setState({widgetPageTitle: widgetPageTitle});

1
src/components/views/rooms/AppsDrawer.js
View file

@ -224,6 +224,7 @@ module.exports = React.createClass({
userId={this.props.userId} userId={this.props.userId}
show={this.props.showApps} show={this.props.showApps}
creatorUserId={app.creatorUserId} creatorUserId={app.creatorUserId}
widgetPageTitle={(app.data && app.data.widgetPageTitle) ? app.data.widgetPageTitle : ''}
/>); />);
}); });