mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-03 03:50:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Weblate 2018-06-14 09:56:09 +00:00
commit b9f69d6893
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/components/structures/TagPanel.js
View file

@ -84,7 +84,10 @@ const TagPanel = React.createClass({
}, },
onMouseDown(e) { onMouseDown(e) {
dis.dispatch({action: 'deselect_tags'}); // only dispatch if its not a no-op
if (this.state.selectedTags.length > 0) {
dis.dispatch({action: 'deselect_tags'});
}
}, },
onCreateGroupClick(ev) { onCreateGroupClick(ev) {
@ -113,17 +116,18 @@ const TagPanel = React.createClass({
/>; />;
}); });
const clearButton = this.state.selectedTags.length > 0 ? let clearButton;
<TintableSvg src="img/icons-close.svg" width="24" height="24" if (this.state.selectedTags.length > 0) {
alt={_t("Clear filter")} clearButton = <AccessibleButton className="mx_TagPanel_clearButton" onClick={this.onClearFilterClick}>
title={_t("Clear filter")} <TintableSvg src="img/icons-close.svg" width="24" height="24"
/> : alt={_t("Clear filter")}
<div />; title={_t("Clear filter")}
/>
</AccessibleButton>;
}
return <div className="mx_TagPanel"> return <div className="mx_TagPanel">
<AccessibleButton className="mx_TagPanel_clearButton" onClick={this.onClearFilterClick}> { clearButton }
{ clearButton }
</AccessibleButton>
<div className="mx_TagPanel_divider" /> <div className="mx_TagPanel_divider" />
<GeminiScrollbarWrapper <GeminiScrollbarWrapper
className="mx_TagPanel_scroller" className="mx_TagPanel_scroller"