File tree Expand file tree Collapse file tree 2 files changed +8
-4
lines changed
app/javascript/ui/grid/interactionLayer Expand file tree Collapse file tree 2 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -62,12 +62,14 @@ class FoamcoreInteractionLayer extends React.Component {
62
62
return
63
63
}
64
64
65
- const childOfInteractionLayer = ev . target . closest (
65
+ const childOfInteractionLayer = ! ! ev . target . closest (
66
66
`.${ FOAMCORE_INTERACTION_LAYER } `
67
67
)
68
+ const childOfCardMenu = ! ! ev . target . closest ( '.card-menu' )
68
69
if (
69
- ev . target . id !== FOAMCORE_INTERACTION_LAYER &&
70
- ! childOfInteractionLayer
70
+ ( ev . target . id !== FOAMCORE_INTERACTION_LAYER &&
71
+ ! childOfInteractionLayer ) ||
72
+ childOfCardMenu
71
73
) {
72
74
return false
73
75
}
Original file line number Diff line number Diff line change 5
5
# DEBUG + include rvm
6
6
source ~ /.bash_profile
7
7
8
+ # -------------
9
+ # NOTE: have to call Elastic setup directly in Codeship config otherwise ES server is inaccessible
8
10
# Start Java 8 for Elasticsearch 6
9
11
source $HOME /bin/jdk/jdk_switcher
10
12
jdk_switcher home oraclejdk8
11
13
jdk_switcher use oraclejdk8
12
-
13
14
# Start up ElasticSearch Version 6.2.0 on port 9333 (so it doesn't conflict with default)
14
15
export ELASTICSEARCH_VERSION=6.2.0
15
16
export ELASTICSEARCH_PORT=9333
16
17
\c url -sSL https://raw.githubusercontent.com/codeship/scripts/master/packages/elasticsearch.sh | bash -s
18
+ # ---------------------
17
19
18
20
# Setup nvm
19
21
export NVM_DIR=" $HOME /.nvm"
You can’t perform that action at this time.
0 commit comments