Skip to content

Commit 8fe453f

Browse files
jonataswalkerjonataswalker
authored
Merge branch 'master' into fix-context-menu-close
2 parents 81c2df7 + 859c471 commit 8fe453f

22 files changed

+6369
-6042
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,15 @@
11
sudo: required
2-
dist: trusty
2+
dist: xenial
33

44
language: node_js
55
node_js:
6-
- "8"
6+
- 'node'
77

88
cache:
99
bundler: true
1010
directories:
1111
- node_modules
1212

13-
addons:
14-
chrome: stable
15-
16-
before_install:
17-
- stty cols 80
18-
- sudo apt-get -qq update
19-
- sudo apt-get install -y libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++
20-
- sudo apt-get install -y fluxbox
21-
- npm i -g npm@5
22-
23-
before_script:
24-
- "export DISPLAY=:99.0"
25-
- "sh -e /etc/init.d/xvfb start"
26-
- sleep 3
27-
- fluxbox >/dev/null 2>&1 &
28-
2913
branches:
3014
only:
31-
- "master"
15+
- 'master'

‎babel.config.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
module.exports = {
2+
presets: [
3+
[
4+
'@babel/preset-env',
5+
{
6+
targets: {
7+
node: 'current',
8+
},
9+
},
10+
],
11+
],
12+
env: {
13+
test: {
14+
presets: [['@babel/preset-env']],
15+
},
16+
},
17+
};

‎build/banner.js‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎build/build-css.js‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎build/config.js‎

Lines changed: 0 additions & 79 deletions
This file was deleted.

‎config/rollup.config.js‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎config/vars.json‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎examples/contextmenu.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
<head>
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6-
<link rel="stylesheet" href="https://unpkg.com/openlayers/dist/ol.css">
7-
<link rel="stylesheet" href="./../dist/ol-contextmenu.min.css">
6+
<link rel="stylesheet" href="https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.2.0/css/ol.css">
7+
<link href="https://unpkg.com/ol-contextmenu/dist/ol-contextmenu.min.css" rel="stylesheet">
88
<link rel="stylesheet" href="contextmenu.css">
99
</head>
1010
<body>
1111
<div id="map" tabindex="0"></div>
12-
<script src="https://unpkg.com/openlayers"></script>
13-
<script src="./../dist/ol-contextmenu.js"></script>
12+
<script src="https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.2.0/build/ol.js"></script>
13+
<script src="https://unpkg.com/ol-contextmenu"></script>
1414
<script src="contextmenu.js"></script>
1515
</body>
1616
</html>

‎jest.config.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
testURL: 'http://localhost/',
3+
setupFiles: ['<rootDir>/test/env-setup.js'],
4+
testRegex: '/test/unit/.*\\.test\\.js$',
5+
transformIgnorePatterns: ['/node_modules/(?!(ol)/)'],
6+
};

‎konstants/index.js‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)