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

This commit is contained in:
Weblate 2018-02-23 16:43:01 +00:00
commit e80bd9b4e5
1 changed files with 8 additions and 1 deletions

View File

@ -20,6 +20,7 @@ import { _t } from 'matrix-react-sdk/lib/languageHandler';
import dis from 'matrix-react-sdk/lib/dispatcher'; import dis from 'matrix-react-sdk/lib/dispatcher';
import TagOrderActions from 'matrix-react-sdk/lib/actions/TagOrderActions'; import TagOrderActions from 'matrix-react-sdk/lib/actions/TagOrderActions';
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg'; import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
import sdk from 'matrix-react-sdk/lib/index';
export default class TagTileContextMenu extends React.Component { export default class TagTileContextMenu extends React.Component {
static propTypes = { static propTypes = {
@ -53,9 +54,15 @@ export default class TagTileContextMenu extends React.Component {
} }
render() { render() {
const TintableSvg = sdk.getComponent("elements.TintableSvg");
return <div> return <div>
<div className="mx_TagTileContextMenu_item" onClick={this._onViewCommunityClick} > <div className="mx_TagTileContextMenu_item" onClick={this._onViewCommunityClick} >
<img className="mx_TagTileContextMenu_item_icon" src="img/icons-groups.svg" width="15" height="15" /> <TintableSvg
className="mx_TagTileContextMenu_item_icon"
src="img/icons-groups.svg"
width="15"
height="15"
/>
{ _t('View Community') } { _t('View Community') }
</div> </div>
<hr className="mx_TagTileContextMenu_separator" /> <hr className="mx_TagTileContextMenu_separator" />