PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Re-add bouncing/callout animation to action buttons

Browse source
This commit is contained in:
Luke Barnard 2017-05-25 13:54:59 +01:00
parent 548f319816
commit 3185d3ed41
5 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/elements/ActionButton.js
View file

@ -27,6 +27,7 @@ export default React.createClass({
size: PropTypes.string, size: PropTypes.string,
tooltip: PropTypes.bool, tooltip: PropTypes.bool,
action: PropTypes.string.isRequired, action: PropTypes.string.isRequired,
mouseOverAction: PropTypes.string,
label: PropTypes.string.isRequired, label: PropTypes.string.isRequired,
iconPath: PropTypes.string.isRequired, iconPath: PropTypes.string.isRequired,
}, },
@ -51,6 +52,9 @@ export default React.createClass({
_onMouseEnter: function() { _onMouseEnter: function() {
if (this.props.tooltip) this.setState({showTooltip: true}); if (this.props.tooltip) this.setState({showTooltip: true});
if (this.props.mouseOverAction) {
dis.dispatch({action: this.props.mouseOverAction});
}
}, },
_onMouseLeave: function() { _onMouseLeave: function() {

1
src/components/views/elements/CreateRoomButton.js
View file

@ -22,6 +22,7 @@ const CreateRoomButton = function(props) {
const ActionButton = sdk.getComponent('elements.ActionButton'); const ActionButton = sdk.getComponent('elements.ActionButton');
return ( return (
<ActionButton action="view_create_chat" <ActionButton action="view_create_chat"
mouseOverAction={props.callout ? "callout_create_room" : null}
label="Create new room" label="Create new room"
iconPath="img/icons-create-room.svg" iconPath="img/icons-create-room.svg"
size={props.size} size={props.size}

1
src/components/views/elements/RoomDirectoryButton.js
View file

@ -22,6 +22,7 @@ const RoomDirectoryButton = function(props) {
const ActionButton = sdk.getComponent('elements.ActionButton'); const ActionButton = sdk.getComponent('elements.ActionButton');
return ( return (
<ActionButton action="view_room_directory" <ActionButton action="view_room_directory"
mouseOverAction={props.callout ? "callout_room_directory" : null}
label="Room directory" label="Room directory"
iconPath="img/icons-directory.svg" iconPath="img/icons-directory.svg"
size={props.size} size={props.size}

3
src/components/views/elements/StartChatButton.js
View file

@ -21,7 +21,8 @@ import PropTypes from 'prop-types';
const StartChatButton = function(props) { const StartChatButton = function(props) {
const ActionButton = sdk.getComponent('elements.ActionButton'); const ActionButton = sdk.getComponent('elements.ActionButton');
return ( return (
<ActionButton action="start_chat" <ActionButton action="view_create_chat"
mouseOverAction={props.callout ? "callout_start_chat" : null}
label="Start chat" label="Start chat"
iconPath="img/icons-people.svg" iconPath="img/icons-people.svg"
size={props.size} size={props.size}

6
src/components/views/rooms/RoomList.js
View file

@ -526,15 +526,15 @@ module.exports = React.createClass({
case 'im.vector.fake.direct': case 'im.vector.fake.direct':
return <div className="mx_RoomList_emptySubListTip"> return <div className="mx_RoomList_emptySubListTip">
Press Press
<StartChatButton size="16" /> <StartChatButton size="16" callout={true}/>
to start a chat with someone to start a chat with someone
</div>; </div>;
case 'im.vector.fake.recent': case 'im.vector.fake.recent':
return <div className="mx_RoomList_emptySubListTip"> return <div className="mx_RoomList_emptySubListTip">
You're not in any rooms yet! Press You're not in any rooms yet! Press
<CreateRoomButton size="16" /> <CreateRoomButton size="16" callout={true}/>
to make a room or to make a room or
<RoomDirectoryButton size="16" /> <RoomDirectoryButton size="16" callout={true}/>
to browse the directory to browse the directory
</div>; </div>;
} }