Skip to content

Commit

Permalink
Update examples/ tests to use ol v6.1.1
Browse files Browse the repository at this point in the history 
No changes requried to ol-layerswitcher but note temporary fix for Turbo87/sidebar-v2
  • Loading branch information
@walkermatt
walkermatt committed Nov 17, 2019
1 parent 52105c4 commit 70b5144
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 14 deletions.
4 changes: 2 additions & 2 deletions examples/addlayer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<meta charset="utf-8" />
<title>OpenLayers - LayerSwitcher Add Layer</title>
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
<link rel="stylesheet" href="https://openlayers.org/en/v5.3.0/css/ol.css" />
<link rel="stylesheet" href="https://openlayers.org/en/v6.1.1/css/ol.css" />
<link rel="stylesheet" href="../src/ol-layerswitcher.css" />
<link rel="stylesheet" href="layerswitcher.css" />
</head>
<body>
<div id="map"></div>
<!-- The line below is only needed for old environments like Internet Explorer and Android 4.x -->
<script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList,URL"></script>
<script src="https://openlayers.org/en/v5.3.0/build/ol.js"></script>
<script src="https://openlayers.org/en/v6.1.1/build/ol.js"></script>
<script src="../dist/ol-layerswitcher.js"></script>
<script src="addlayer.js"></script>
</body>
Expand Down
4 changes: 2 additions & 2 deletions examples/collapse-groups.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<meta charset="utf-8" />
<title>OpenLayers - LayerSwitcher</title>
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
<link rel="stylesheet" href="https://openlayers.org/en/v5.3.0/css/ol.css" />
<link rel="stylesheet" href="https://openlayers.org/en/v6.1.1/css/ol.css" />
<link rel="stylesheet" href="../src/ol-layerswitcher.css" />
<link rel="stylesheet" href="layerswitcher.css" />
</head>
<body>
<div id="map"></div>
<!-- The line below is only needed for old environments like Internet Explorer and Android 4.x -->
<script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList,URL"></script>
<script src="https://openlayers.org/en/v5.3.0/build/ol.js"></script>
<script src="https://openlayers.org/en/v6.1.1/build/ol.js"></script>
<script src="../dist/ol-layerswitcher.js"></script>
<script src="collapse-groups.js"></script>
</body>
Expand Down
4 changes: 2 additions & 2 deletions examples/layerswitcher.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<meta charset="utf-8" />
<title>OpenLayers - LayerSwitcher</title>
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
<link rel="stylesheet" href="https://openlayers.org/en/v5.3.0/css/ol.css" />
<link rel="stylesheet" href="https://openlayers.org/en/v6.1.1/css/ol.css" />
<link rel="stylesheet" href="../src/ol-layerswitcher.css" />
<link rel="stylesheet" href="layerswitcher.css" />
</head>
<body>
<div id="map"></div>
<!-- The line below is only needed for old environments like Internet Explorer and Android 4.x -->
<script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList,URL"></script>
<script src="https://openlayers.org/en/v5.3.0/build/ol.js"></script>
<script src="https://openlayers.org/en/v6.1.1/build/ol.js"></script>
<script src="../dist/ol-layerswitcher.js"></script>
<script src="layerswitcher.js"></script>
</body>
Expand Down
4 changes: 2 additions & 2 deletions examples/scroll.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" />
<title>OpenLayers - LayerSwitcher Scrolling</title>
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
<link rel="stylesheet" href="https://openlayers.org/en/v5.3.0/css/ol.css" />
<link rel="stylesheet" href="https://openlayers.org/en/v6.1.1/css/ol.css" />
<link rel="stylesheet" href="../src/ol-layerswitcher.css" />
<link rel="stylesheet" href="layerswitcher.css" />
<link rel="stylesheet" href="scroll.css" />
Expand All @@ -13,7 +13,7 @@
<div id="map"></div>
<!-- The line below is only needed for old environments like Internet Explorer and Android 4.x -->
<script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList,URL"></script>
<script src="https://openlayers.org/en/v5.3.0/build/ol.js"></script>
<script src="https://openlayers.org/en/v6.1.1/build/ol.js"></script>
<script src="../dist/ol-layerswitcher.js"></script>
<script src="scroll.js"></script>
</body>
Expand Down
4 changes: 2 additions & 2 deletions examples/select-groups.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<meta charset="utf-8" />
<title>OpenLayers - Selectable Groups</title>
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
<link rel="stylesheet" href="https://openlayers.org/en/v5.3.0/css/ol.css" />
<link rel="stylesheet" href="https://openlayers.org/en/v6.1.1/css/ol.css" />
<link rel="stylesheet" href="../src/ol-layerswitcher.css" />
<link rel="stylesheet" href="select-groups.css" />
</head>
<body>
<div id="map"></div>
<!-- The line below is only needed for old environments like Internet Explorer and Android 4.x -->
<script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList,URL"></script>
<script src="https://openlayers.org/en/v5.3.0/build/ol.js"></script>
<script src="https://openlayers.org/en/v6.1.1/build/ol.js"></script>
<script src="../dist/ol-layerswitcher.js"></script>
<script src="select-groups.js"></script>
</body>
Expand Down
13 changes: 11 additions & 2 deletions examples/sidebar.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<title>OpenLayers - LayerSwitcher sidebar</title>
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
<link rel="stylesheet" href="https://openlayers.org/en/v5.3.0/css/ol.css" />
<link rel="stylesheet" href="https://openlayers.org/en/v6.1.1/css/ol.css" />
<link rel="stylesheet" href="https://rawgit.com/Turbo87/sidebar-v2/master/css/ol3-sidebar.css" />
<link rel="stylesheet" href="../src/ol-layerswitcher.css" />
<link rel="stylesheet" href="sidebar.css" />
Expand Down Expand Up @@ -58,7 +58,16 @@ <h1 class="sidebar-header">Settings<span class="sidebar-close"><i class="fa fa-c
<div id="map" class="sidebar-map"></div>
<!-- The line below is only needed for old environments like Internet Explorer and Android 4.x -->
<script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList,URL"></script>
<script src="https://openlayers.org/en/v5.3.0/build/ol.js"></script>
<script src="https://openlayers.org/en/v6.1.1/build/ol.js"></script>
<script>
// TEMP sidebar-v2 requires ol.inherits which was removed in ol v6.0
if (window.ol && !window.ol.inherits) {
ol.inherits = function inherits(childCtor, parentCtor) {
childCtor.prototype = Object.create(parentCtor.prototype);
childCtor.prototype.constructor = childCtor;
}
}
</script>
<script src="https://rawgit.com/Turbo87/sidebar-v2/master/js/ol3-sidebar.js"></script>
<script src="../dist/ol-layerswitcher.js"></script>
<script src="sidebar.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions test/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>ol-layerswitcher spec runner</title>
<meta charset="utf-8">
<link rel="stylesheet" type="text/css" href="../node_modules/mocha/mocha.css">
<link rel="stylesheet" href="https://openlayers.org/en/v5.1.3/css/ol.css" />
<link rel="stylesheet" href="https://openlayers.org/en/v6.1.1/css/ol.css" />
<link rel="stylesheet" type="text/css" href="../src/ol-layerswitcher.css">
<style type="text/css">
/* Can be useful when writing tests, uncomment the following CSS to always show
Expand All @@ -29,7 +29,7 @@
bail: false
});
</script>
<script src="https://openlayers.org/en/v5.1.3/build/ol.js"></script>
<script src="https://openlayers.org/en/v6.1.1/build/ol.js"></script>
<script type="text/javascript" src="../dist/ol-layerswitcher.js"></script>
<script type="text/javascript" src="utils.js"></script>
<script type="text/javascript" src="spec/ol-layerswitcher.js"></script>
Expand Down

0 comments on commit 70b5144

Please sign in to comment.