Skip to content

Commit 8fae604

Browse files
alaframboisealaframboise
committed
Merge pull request #126 from alaframboise/master
Support for bootstrap 3.2.0 and new dist build
2 parents f8a23f8 + 26c6b8a commit 8fae604

File tree

20 files changed

+57
-58
lines changed

20 files changed

+57
-58
lines changed

‎README.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,11 @@ This repository contains the following:
4949
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
5050

5151
<!-- Step 1. Add CSS for Bootstrap, ArcGIS and Bootstrap-map-js -->
52-
53-
<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet" media="screen">
52+
<link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet" media="screen">
5453
<link rel="stylesheet" type="text/css" href="http://js.arcgis.com/3.10/js/esri/css/esri.css">
5554
<link rel="stylesheet" type="text/css" href="http://esri.github.io/bootstrap-map-js/src/css/bootstrapmap.css">
5655
<style>
57-
<!-- Set the responsive map size here -->
56+
/* Set the responsive map size here */
5857
#mapDiv {
5958
min-height:100px;
6059
max-height:500px;
@@ -65,7 +64,6 @@ This repository contains the following:
6564
<body>
6665

6766
<!-- Step 2. Add HTML to define the layout of the map and page -->
68-
6967
<div class="container" style="padding:15px;">
7068
<div class="row">
7169
<div class="col-xs-12">
@@ -86,7 +84,6 @@ This repository contains the following:
8684
</div>
8785

8886
<!-- Step 3. Add JS to Load the responsive map -->
89-
9087
<script type="text/javascript">
9188
var package_path = "//esri.github.com/bootstrap-map-js/src/js";
9289
var dojoConfig = {
@@ -111,9 +108,9 @@ This repository contains the following:
111108
</script>
112109

113110
<!-- jQuery (for Bootstrap's JavaScript plugins). NOTE: You can also use pure Dojo. See examples. -->
114-
<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
111+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
115112
<!-- Include all plugins or individual files as needed -->
116-
<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
113+
<script src="//netdna.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
117114
</body>
118115
</html>
119116
```
@@ -138,7 +135,7 @@ Visit the [Getting Started Guide](http://esri.github.io/bootstrap-map-js/demo/in
138135

139136
## Developer Notes
140137

141-
* Bootstrap-map-js Styles Only: If you just want to use the styles and popup formatting, and you don't care about a responsive map, just reference bootstrapmap.css file to your projects. Take a look at these [examples](https://github.com/Esri/quickstart-map-js) to get see how to do this.
138+
* Bootstrapmap.css Only: If you just want to use the styles and popup formatting, and you don't care about a responsive map, just reference bootstrapmap.css in your projects. Take a look at these [examples](https://github.com/Esri/quickstart-map-js) to get see how to do this.
142139
* Responsive Map: You can only have one responsive map per page. You can have as many maps as you want that are fixed in size however.
143140
* ScrollwheelZoom: To enable scrollwheel zoom, set ```scrollWheelZoom: true``` in the constructor. A scrolling map will "slip" however if the page is larger than the viewport, therefore, this is set to ```false``` by default.
144141
* IE8 Support: Add the following shims to support IE8. For more information visit [getbootstrap.com](http://getbootstrap.com/getting-started/#support).

‎bower.json

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
11
{
22
"name": "bootstrap-map-js",
3-
"version": "0.0.1",
4-
"homepage": "https://github.com/alaframboise/bootstrap-map-js",
3+
"version": "0.0.2",
4+
"homepage": "https://esri.github.com/bootstrap-map-js/demo/index.html",
55
"authors": [
66
"Allan Laframboise <alaframboise@esri.com>"
77
],
8-
"description": "A light-weight JS/CSS extension for building responsive web mapping apps with ArcGIS and Bootstrap 3",
9-
"main": "src/js/bootstrapmap.js",
8+
"description": "A light-weight JS/CSS extension for building responsive web mapping apps with ArcGIS and Bootstrap 3.",
9+
"main": [
10+
"dist/js/bootstrapmap.js",
11+
"dist/css/bootstrapmap.css"
12+
],
1013
"moduleType": [
1114
"amd"
1215
],
1316
"keywords": [
1417
"Esri",
1518
"Bootstrap",
1619
"ArcGIS",
17-
"JavaScript"
20+
"JavaScript",
21+
"Map",
22+
"Mapping"
1823
],
1924
"license": "Apache",
2025
"ignore": [
2126
"**/.*",
22-
"bootstrapmapjs.png",
2327
"README.md",
2428
"templates",
2529
"demo"

‎demo/dojo/getstarted.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<title>Bootstrap Map JS - Get Started</title>
1818

1919
<!-- Bootstrap core CSS -->
20-
<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
20+
<link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
2121

2222
<!-- Custom styles for this template -->
2323
<link href="../css/style.css" rel="stylesheet">
@@ -132,7 +132,6 @@ <h3>Step 1: Get Bootstrap-map-js</h3>
132132
<ul>
133133
<li>\src\js\bootstrapmap.js</li>
134134
<li>\src\css\bootstrapmap.css</li>
135-
<li>\src\images\popup.png</li>
136135
<li>\demo\...</li>
137136
<li>\templates\...</li>
138137
</ul>
@@ -190,7 +189,7 @@ <h3>Step 3: Add the map</h3>
190189
&lt;title>Bootstrap 101 Template&lt;/title>
191190
&lt;meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
192191
&lt;!-- Bootstrap -->
193-
&lt;link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet" media="screen">
192+
&lt;link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet" media="screen">
194193
<b>
195194
&lt;!-- Step 1. Add CSS for the mapping components -->
196195
&lt;link rel="stylesheet" type="text/css" href="http://js.arcgis.com/3.10/js/esri/css/esri.css">

‎demo/dojo/grid.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<title>Bootstrap Map JS - Grid</title>
1818

1919
<!-- Bootstrap core CSS -->
20-
<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
20+
<link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
2121

2222
<!-- Custom styles for this template -->
2323
<link href="../css/style.css" rel="stylesheet">

‎demo/dojo/maps.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<title>Bootstrap Map JS - Get Started</title>
1818

1919
<!-- Bootstrap core CSS -->
20-
<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
20+
<link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
2121

2222
<!-- Custom styles for this template -->
2323
<link href="../css/style.css" rel="stylesheet">

‎demo/dojo/media.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<title>Bootstrap Map JS - Four Maps</title>
1818

1919
<!-- Bootstrap core CSS -->
20-
<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
20+
<link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
2121

2222
<!-- Custom styles for this template -->
2323
<link href="../css/style.css" rel="stylesheet">

‎demo/dojo/webmap.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<title>Bootstrap Map JS - Web Map</title>
1818

1919
<!-- Bootstrap core CSS -->
20-
<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
20+
<link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
2121

2222
<!-- Custom styles for this template -->
2323
<link href="../css/style.css" rel="stylesheet">

‎demo/dojo/windows.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<title>Bootstrap Map JS - Geosearch</title>
1818

1919
<!-- Bootstrap core CSS -->
20-
<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
20+
<link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
2121

2222
<!-- Custom styles for this template -->
2323
<link href="../css/style.css" rel="stylesheet">

‎demo/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<title>Bootstrap Map JS - Demos</title>
1717

1818
<!-- Bootstrap core CSS -->
19-
<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
19+
<link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
2020

2121
<style type="text/css">
2222
.jumbotron {

‎demo/jquery/getstarted.html

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<title>Bootstrap Map JS - Get Started</title>
1818

1919
<!-- Bootstrap core CSS -->
20-
<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
20+
<link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
2121

2222
<!-- Custom styles for this template -->
2323
<link href="../css/style.css" rel="stylesheet">
@@ -132,7 +132,6 @@ <h3>Step 1: Get Bootstrap-map-js</h3>
132132
<ul>
133133
<li>\src\js\bootstrapmap.js</li>
134134
<li>\src\css\bootstrapmap.css</li>
135-
<li>\src\images\popup.png</li>
136135
<li>\demo\...</li>
137136
<li>\templates\...</li>
138137
</ul>
@@ -194,7 +193,7 @@ <h3>Step 3: Add the map</h3>
194193
&lt;title>Bootstrap 101 Template&lt;/title>
195194
&lt;meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
196195
&lt;!-- Bootstrap -->
197-
&lt;link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet" media="screen">
196+
&lt;link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet" media="screen">
198197
<b>
199198
&lt;!-- Step 1. Add CSS for the mapping components -->
200199
&lt;link rel="stylesheet" type="text/css" href="http://js.arcgis.com/3.10/js/esri/css/esri.css">
@@ -244,9 +243,9 @@ <h3>Step 3: Add the map</h3>
244243
&lt;/script>
245244
</b>
246245
&lt;!-- jQuery (for Bootstrap's JavaScript plugins) -->
247-
&lt;script src="http://code.jquery.com/jquery-1.10.1.min.js">&lt;/script>
246+
&lt;script src="http://code.jquery.com/jquery-1.11.1.min.js">&lt;/script>
248247
&lt;!-- Include all plugins or individual files as needed -->
249-
&lt;script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js">&lt;/script>
248+
&lt;script src="//netdna.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js">&lt;/script>
250249
&lt;/body>
251250
&lt;/html>
252251
</pre>
@@ -307,8 +306,8 @@ <h3>Step 3: Add the map</h3>
307306
<!-- Bootstrap core JavaScript
308307
================================================== -->
309308
<!-- Placed at the end of the document so the pages load faster -->
310-
<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
311-
<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
309+
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
310+
<script src="//netdna.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
312311

313312
<!-- add syntax highlighting to code snippts -->
314313
<script src="https://google-code-prettify.googlecode.com/svn/loader/run_prettify.js"></script>

‎demo/jquery/grid.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<title>Bootstrap Map JS - Grid</title>
1818

1919
<!-- Bootstrap core CSS -->
20-
<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
20+
<link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
2121

2222
<!-- Custom styles for this template -->
2323
<link href="../css/style.css" rel="stylesheet">
@@ -332,8 +332,8 @@ <h5>Right 3</h5>
332332
<!-- Bootstrap core JavaScript
333333
================================================== -->
334334
<!-- Placed at the end of the document so the pages load faster -->
335-
<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
336-
<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
335+
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
336+
<script src="//netdna.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
337337

338338
</body>
339339
</html>

‎demo/jquery/maps.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<title>Bootstrap Map JS - Get Started</title>
1818

1919
<!-- Bootstrap core CSS -->
20-
<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
20+
<link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
2121

2222
<!-- Custom styles for this template -->
2323
<link href="../css/style.css" rel="stylesheet">
@@ -149,7 +149,7 @@
149149
<!-- Bootstrap core JavaScript
150150
================================================== -->
151151
<!-- Placed at the end of the document so the pages load faster -->
152-
<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
153-
<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
152+
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
153+
<script src="//netdna.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
154154
</body>
155155
</html>

‎demo/jquery/media.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<title>Bootstrap Map JS - Four Maps</title>
1818

1919
<!-- Bootstrap core CSS -->
20-
<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
20+
<link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
2121

2222
<!-- Custom styles for this template -->
2323
<link href="../css/style.css" rel="stylesheet">
@@ -228,8 +228,8 @@ <h2>Media Queries</h2>
228228
<!-- Bootstrap core JavaScript
229229
================================================== -->
230230
<!-- Placed at the end of the document so the pages load faster -->
231-
<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
232-
<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
231+
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
232+
<script src="//netdna.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
233233

234234
</body>
235235
</html>

‎demo/jquery/webmap.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<title>Bootstrap Map JS - Web Map</title>
1818

1919
<!-- Bootstrap core CSS -->
20-
<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
20+
<link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
2121

2222
<!-- Custom styles for this template -->
2323
<link href="../css/style.css" rel="stylesheet">
@@ -339,9 +339,9 @@ <h4 class="panel-title">
339339
<!-- Bootstrap core JavaScript
340340
================================================== -->
341341
<!-- Placed at the end of the document so the pages load faster -->
342-
<!--script src="http://code.jquery.com/jquery-1.10.1.min.js"></script-->
342+
<!--script src="http://code.jquery.com/jquery-1.11.1.min.js"></script-->
343343
<script src="https://code.jquery.com/jquery.js"></script>
344-
<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
344+
<script src="//netdna.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
345345

346346
</body>
347347
</html>

‎demo/jquery/windows.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<title>Bootstrap Map JS - Geosearch</title>
1818

1919
<!-- Bootstrap core CSS -->
20-
<link href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
20+
<link href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
2121

2222
<!-- Custom styles for this template -->
2323
<link href="../css/style.css" rel="stylesheet">
@@ -365,7 +365,7 @@ <h4 class="modal-title">Geosearch</h4>
365365
<!-- Bootstrap core JavaScript
366366
================================================== -->
367367
<!-- Placed at the end of the document so the pages load faster -->
368-
<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
369-
<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
368+
<script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
369+
<script src="//netdna.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
370370
</body>
371371
</html>

0 commit comments

Comments
 (0)