gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Weblate 2017-07-03 18:04:36 +00:00
parent c565d31e53 cb17cb0535
commit b7cc469f7b
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -19,4 +19,4 @@ node_js:
install: install:
# clone the deps with depth 1: we know we will only ever need that one # clone the deps with depth 1: we know we will only ever need that one
# commit. # commit.
- scripts/fetch-develop.deps.sh --depth 1 && npm install - scripts/fetch-develop.deps.sh --depth 1 && npm i phantomjs-prebuilt && npm install

13
src/components/views/context_menus/MessageContextMenu.js
View File

@ -67,7 +67,7 @@ module.exports = React.createClass({
onResendClick: function() { onResendClick: function() {
Resend.resend(this.props.mxEvent); Resend.resend(this.props.mxEvent);
if (this.props.onFinished) this.props.onFinished(); this.closeMenu();
}, },
onViewSourceClick: function() { onViewSourceClick: function() {
@ -75,7 +75,7 @@ module.exports = React.createClass({
Modal.createDialog(ViewSource, { Modal.createDialog(ViewSource, {
content: this.props.mxEvent.event, content: this.props.mxEvent.event,
}, 'mx_Dialog_viewsource'); }, 'mx_Dialog_viewsource');
if (this.props.onFinished) this.props.onFinished(); this.closeMenu();
}, },
onViewClearSourceClick: function() { onViewClearSourceClick: function() {
@ -84,7 +84,7 @@ module.exports = React.createClass({
// FIXME: _clearEvent is private // FIXME: _clearEvent is private
content: this.props.mxEvent._clearEvent, content: this.props.mxEvent._clearEvent,
}, 'mx_Dialog_viewsource'); }, 'mx_Dialog_viewsource');
if (this.props.onFinished) this.props.onFinished(); this.closeMenu();
}, },
onRedactClick: function() { onRedactClick: function() {
@ -106,12 +106,12 @@ module.exports = React.createClass({
}).done(); }).done();
}, },
}, 'mx_Dialog_confirmredact'); }, 'mx_Dialog_confirmredact');
if (this.props.onFinished) this.props.onFinished(); this.closeMenu();
}, },
onCancelSendClick: function() { onCancelSendClick: function() {
Resend.removeFromQueue(this.props.mxEvent); Resend.removeFromQueue(this.props.mxEvent);
if (this.props.onFinished) this.props.onFinished(); this.closeMenu();
}, },
onForwardClick: function() { onForwardClick: function() {
@ -130,7 +130,7 @@ module.exports = React.createClass({
if (this.props.eventTileOps) { if (this.props.eventTileOps) {
this.props.eventTileOps.unhideWidget(); this.props.eventTileOps.unhideWidget();
} }
if (this.props.onFinished) this.props.onFinished(); this.closeMenu();
}, },
onQuoteClick: function() { onQuoteClick: function() {
@ -139,6 +139,7 @@ module.exports = React.createClass({
action: 'quote', action: 'quote',
event: this.props.mxEvent, event: this.props.mxEvent,
}); });
this.closeMenu();
}, },
render: function() { render: function() {