Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 14:05:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Weblate 2018-04-25 15:32:14 +00:00
commit 4cad39bb36
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/views/elements/AppTile.js
View File

@ -609,14 +609,14 @@ export default class AppTile extends React.Component {
</span> </span>
<span className="mx_AppTileMenuBarWidgets"> <span className="mx_AppTileMenuBarWidgets">
{ /* Popout widget */ } { /* Popout widget */ }
<TintableSvgButton { this.props.showPopout && <TintableSvgButton
src={popoutWidgetIcon} src={popoutWidgetIcon}
className="mx_AppTileMenuBarWidget mx_AppTileMenuBarWidgetPadding" className="mx_AppTileMenuBarWidget mx_AppTileMenuBarWidgetPadding"
title={_t('Popout widget')} title={_t('Popout widget')}
onClick={this._onPopoutWidgetClick} onClick={this._onPopoutWidgetClick}
width="10" width="10"
height="10" height="10"
/> /> }
{ /* Snapshot widget */ } { /* Snapshot widget */ }
{ showPictureSnapshotButton && <TintableSvgButton { showPictureSnapshotButton && <TintableSvgButton
@ -689,6 +689,8 @@ AppTile.propTypes = {
handleMinimisePointerEvents: PropTypes.bool, handleMinimisePointerEvents: PropTypes.bool,
// Optionally hide the delete icon // Optionally hide the delete icon
showDelete: PropTypes.bool, showDelete: PropTypes.bool,
// Optionally hide the popout widget icon
showPopout: PropTypes.bool,
// Widget apabilities to allow by default (without user confirmation) // Widget apabilities to allow by default (without user confirmation)
// NOTE -- Use with caution. This is intended to aid better integration / UX // NOTE -- Use with caution. This is intended to aid better integration / UX
// basic widget capabilities, e.g. injecting sticker message events. // basic widget capabilities, e.g. injecting sticker message events.
@ -705,6 +707,7 @@ AppTile.defaultProps = {
showTitle: true, showTitle: true,
showMinimise: true, showMinimise: true,
showDelete: true, showDelete: true,
showPopout: true,
handleMinimisePointerEvents: false, handleMinimisePointerEvents: false,
whitelistCapabilities: [], whitelistCapabilities: [],
}; };

1
src/components/views/rooms/Stickerpicker.js
View File

@ -174,6 +174,7 @@ export default class Stickerpicker extends React.Component {
showTitle={false} showTitle={false}
showMinimise={true} showMinimise={true}
showDelete={false} showDelete={false}
showPopout={false}
onMinimiseClick={this._onHideStickersClick} onMinimiseClick={this._onHideStickersClick}
handleMinimisePointerEvents={true} handleMinimisePointerEvents={true}
whitelistCapabilities={['m.sticker']} whitelistCapabilities={['m.sticker']}