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

Rename event edit button to options button

Browse source 
This naming is clearer as it doesn't really edit at all (it shows a context
menu). This should also be less confusing with actual editing when it arrives.
This commit is contained in:
J. Ryan Stinnett 2019-04-26 11:01:29 +01:00
parent 147c287acd
commit 530c92e03d
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
res/css/views/rooms/_EventTile.scss
View file

@ -219,7 +219,7 @@ limitations under the License.
width: auto; width: auto;
} }
.mx_EventTile_editButton { .mx_EventTile_optionsButton {
position: absolute; position: absolute;
display: inline-block; display: inline-block;
visibility: hidden; visibility: hidden;
@ -232,8 +232,8 @@ limitations under the License.
user-select: none; user-select: none;
} }
.mx_EventTile:hover .mx_EventTile_editButton, .mx_EventTile:hover .mx_EventTile_optionsButton,
.mx_EventTile.menu .mx_EventTile_editButton { .mx_EventTile.menu .mx_EventTile_optionsButton {
visibility: visible; visibility: visible;
} }
@ -551,7 +551,7 @@ limitations under the License.
top: 3px; top: 3px;
} }
.mx_EventTile_editButton { .mx_EventTile_optionsButton {
top: 3px; top: 3px;
} }

8
src/components/views/rooms/EventTile.js
View file

@ -309,7 +309,7 @@ module.exports = withMatrixClient(React.createClass({
return actions.tweaks.highlight; return actions.tweaks.highlight;
}, },
onEditClicked: function(e) { onOptionsClicked: function(e) {
const MessageContextMenu = sdk.getComponent('context_menus.MessageContextMenu'); const MessageContextMenu = sdk.getComponent('context_menus.MessageContextMenu');
const buttonRect = e.target.getBoundingClientRect(); const buttonRect = e.target.getBoundingClientRect();
@ -602,8 +602,8 @@ module.exports = withMatrixClient(React.createClass({
} }
} }
const editButton = ( const optionsButton = (
<span className="mx_EventTile_editButton" title={_t("Options")} onClick={this.onEditClicked} /> <span className="mx_EventTile_optionsButton" title={_t("Options")} onClick={this.onOptionsClicked} />
); );
const timestamp = this.props.mxEvent.getTs() ? const timestamp = this.props.mxEvent.getTs() ?
@ -755,7 +755,7 @@ module.exports = withMatrixClient(React.createClass({
showUrlPreview={this.props.showUrlPreview} showUrlPreview={this.props.showUrlPreview}
onHeightChanged={this.props.onHeightChanged} /> onHeightChanged={this.props.onHeightChanged} />
{ keyRequestInfo } { keyRequestInfo }
{ editButton } { optionsButton }
</div> </div>
{ {
// The avatar goes after the event tile as it's absolutly positioned to be over the // The avatar goes after the event tile as it's absolutly positioned to be over the