Skip to content

Commit

Permalink
1.1.4 hotfix to patch mapbox dep
Browse files Browse the repository at this point in the history
  • Loading branch information
ianjennings committed Jun 2, 2017
1 parent 22decc5 commit 07968e9
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
7 changes: 2 additions & 5 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eon-map",
"version": "1.1.3",
"version": "1.1.4",
"homepage": "https://github.com/pubnub/eon-map",
"authors": [
"Ian Jennings <ian@meetjennings.com>"
Expand Down Expand Up @@ -31,12 +31,9 @@
],
"dependencies": {
"pubnub": "~4.0.10",
"mapbox.js": "^2.4.0",
"mapbox.js": "^3.1.1",
"google-maps": "^3.2.1",
"leaflet": "^1.0.3",
"Leaflet.GridLayer.GoogleMutant": "https://gitlab.com/IvanSanchez/Leaflet.GridLayer.GoogleMutant.git"
},
"resolutions": {
"mapbox.js": "^3.1.1"
}
}
6 changes: 5 additions & 1 deletion examples/google.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Leaflet</title>

<script src="https://unpkg.com/leaflet@1.0.3/dist/leaflet.js"></script>
<!-- <script src="https://unpkg.com/leaflet@1.0.3/dist/leaflet.js"></script>
<script src="../bower_components/google-maps/lib/Google.js"></script>
<script src='../bower_components/Leaflet.GridLayer.GoogleMutant/Leaflet.GoogleMutant.js'></script>
Expand All @@ -13,6 +13,10 @@
<script src="../bower_components/pubnub/dist/web/pubnub.min.js"></script>
<script src="../eon-map.js"></script>
-->
<script type="text/javascript" src="../../eon/v/eon/1.1.0/eon.js"></script>
<link rel="stylesheet" href="../../eon/v/eon/1.1.0/eon.css" />


<style type="text/css">
body {
Expand Down
7 changes: 5 additions & 2 deletions examples/simple.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
width:100%;
}
</style>

<!--
<script src="https://unpkg.com/leaflet@1.0.3/dist/leaflet.js"></script>
<script src="../bower_components/google-maps/lib/Google.js"></script>
Expand All @@ -26,7 +26,10 @@
<script src="../bower_components/mapbox.js/mapbox.standalone.js"></script>
<script src="../bower_components/pubnub/dist/web/pubnub.min.js"></script>
<script src="../eon-map.js"></script>
<script src="../eon-map.js"></script> -->

<script type="text/javascript" src="../../eon/v/eon/1.1.0/eon.js"></script>
<link rel="stylesheet" href="../../eon/v/eon/1.1.0/eon.css" />

</head>
<body>
Expand Down

0 comments on commit 07968e9

Please sign in to comment.