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

Merge pull request #2822 from matrix-org/travis/minimize-widgets

Browse source 
Minimize stickerpicker when the title is clicked
This commit is contained in:
Travis Ralston 2019-03-26 07:44:14 -06:00 • committed by GitHub
commit 1703e3860b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -447,10 +447,14 @@ export default class AppTile extends React.Component {
} }
// Toggle the view state of the apps drawer // Toggle the view state of the apps drawer
dis.dispatch({ if (this.props.userWidget) {
action: 'appsDrawer', this._onMinimiseClick();
show: !this.props.show, } else {
}); dis.dispatch({
action: 'appsDrawer',
show: !this.props.show,
});
}
} }
_getSafeUrl() { _getSafeUrl() {
@ -626,7 +630,7 @@ export default class AppTile extends React.Component {
{ /* Maximise widget */ } { /* Maximise widget */ }
{ showMaximiseButton && <AccessibleButton { showMaximiseButton && <AccessibleButton
className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_maximise" className="mx_AppTileMenuBar_iconButton mx_AppTileMenuBar_iconButton_maximise"
title={_t('Minimize apps')} title={_t('Maximize apps')}
onClick={this._onMinimiseClick} onClick={this._onMinimiseClick}
/> } /> }
{ /* Title */ } { /* Title */ }

1
src/i18n/strings/en_EN.json
View file

@ -935,6 +935,7 @@
"Failed to remove widget": "Failed to remove widget", "Failed to remove widget": "Failed to remove widget",
"An error ocurred whilst trying to remove the widget from the room": "An error ocurred whilst trying to remove the widget from the room", "An error ocurred whilst trying to remove the widget from the room": "An error ocurred whilst trying to remove the widget from the room",
"Minimize apps": "Minimize apps", "Minimize apps": "Minimize apps",
"Maximize apps": "Maximize apps",
"Reload widget": "Reload widget", "Reload widget": "Reload widget",
"Popout widget": "Popout widget", "Popout widget": "Popout widget",
"Picture": "Picture", "Picture": "Picture",