Skip to content

Commit c12106b

Browse files
author
kaptron
committed
fix FoamcoreInteractionLayer check and allow popoutMenu to be ignored
1 parent 47c974c commit c12106b

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

app/javascript/ui/grid/interactionLayer/FoamcoreInteractionLayer.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,14 @@ class FoamcoreInteractionLayer extends React.Component {
6262
return
6363
}
6464

65-
const childOfInteractionLayer = ev.target.closest(
65+
const childOfInteractionLayer = !!ev.target.closest(
6666
`.${FOAMCORE_INTERACTION_LAYER}`
6767
)
68+
const childOfCardMenu = !!ev.target.closest('.card-menu')
6869
if (
69-
ev.target.id !== FOAMCORE_INTERACTION_LAYER &&
70-
!childOfInteractionLayer
70+
(ev.target.id !== FOAMCORE_INTERACTION_LAYER &&
71+
!childOfInteractionLayer) ||
72+
childOfCardMenu
7173
) {
7274
return false
7375
}

script/codeship-setup

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@
55
# DEBUG + include rvm
66
source ~/.bash_profile
77

8+
# -------------
9+
# NOTE: have to call Elastic setup directly in Codeship config otherwise ES server is inaccessible
810
# Start Java 8 for Elasticsearch 6
911
source $HOME/bin/jdk/jdk_switcher
1012
jdk_switcher home oraclejdk8
1113
jdk_switcher use oraclejdk8
12-
1314
# Start up ElasticSearch Version 6.2.0 on port 9333 (so it doesn't conflict with default)
1415
export ELASTICSEARCH_VERSION=6.2.0
1516
export ELASTICSEARCH_PORT=9333
1617
\curl -sSL https://raw.githubusercontent.com/codeship/scripts/master/packages/elasticsearch.sh | bash -s
18+
# ---------------------
1719

1820
# Setup nvm
1921
export NVM_DIR="$HOME/.nvm"

0 commit comments

Comments
 (0)