From f36c1ca2072a61ac9dffbe64cc848ac1b558be60 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Tue, 27 Jun 2017 14:51:18 +0100
Subject: [PATCH 1/2] fix Quote not closing contextual menu
also use `this.closeMenu();` over the explicit direct call as the wrapper exists and is a little clearer
---
.../views/context_menus/MessageContextMenu.js | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index bc82778a..1c287738 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -67,7 +67,7 @@ module.exports = React.createClass({
onResendClick: function() {
Resend.resend(this.props.mxEvent);
- if (this.props.onFinished) this.props.onFinished();
+ this.closeMenu();
},
onViewSourceClick: function() {
@@ -75,7 +75,7 @@ module.exports = React.createClass({
Modal.createDialog(ViewSource, {
content: this.props.mxEvent.event,
}, 'mx_Dialog_viewsource');
- if (this.props.onFinished) this.props.onFinished();
+ this.closeMenu();
},
onViewClearSourceClick: function() {
@@ -84,7 +84,7 @@ module.exports = React.createClass({
// FIXME: _clearEvent is private
content: this.props.mxEvent._clearEvent,
}, 'mx_Dialog_viewsource');
- if (this.props.onFinished) this.props.onFinished();
+ this.closeMenu();
},
onRedactClick: function() {
@@ -106,12 +106,12 @@ module.exports = React.createClass({
}).done();
},
}, 'mx_Dialog_confirmredact');
- if (this.props.onFinished) this.props.onFinished();
+ this.closeMenu();
},
onCancelSendClick: function() {
Resend.removeFromQueue(this.props.mxEvent);
- if (this.props.onFinished) this.props.onFinished();
+ this.closeMenu();
},
onForwardClick: function() {
@@ -130,7 +130,7 @@ module.exports = React.createClass({
if (this.props.eventTileOps) {
this.props.eventTileOps.unhideWidget();
}
- if (this.props.onFinished) this.props.onFinished();
+ this.closeMenu();
},
onQuoteClick: function() {
@@ -139,6 +139,7 @@ module.exports = React.createClass({
action: 'quote',
event: this.props.mxEvent,
});
+ this.closeMenu();
},
render: function() {
From 39ff11fe8242a56ee97eeeb4a4523d46d98f6370 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Mon, 3 Jul 2017 18:13:56 +0100
Subject: [PATCH 2/2] preinstall phantomjs to try get rid of boom error
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index e020ba7d..0656064e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,4 +19,4 @@ node_js:
install:
# clone the deps with depth 1: we know we will only ever need that one
# commit.
- - scripts/fetch-develop.deps.sh --depth 1 && npm install
+ - scripts/fetch-develop.deps.sh --depth 1 && npm i phantomjs-prebuilt && npm install