Skip to content

Commit a01afea

Browse files
authored
Merge pull request #229 from ryanttb/master
jQuery 3 support and point buffer function
2 parents f9e10f8 + 67d4ada commit a01afea

File tree

12 files changed

+2672
-333
lines changed

12 files changed

+2672
-333
lines changed

CONTRIBUTING.md

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,18 @@ Regarding code style like indentation and whitespace, **follow the conventions y
1010

1111
Please follow jQuery Foundation [JavaScript Style Guide](http://contribute.jquery.org/style-guide/js/) and/or [idomatic.js](https://github.com/rwldrn/idiomatic.js/).
1212

13+
## Working with the source code
14+
15+
The source code is in the `js` subdirectory. There is an empty HTML page in the test subdirectory which is pulling in the individual files from the `js` subdirectory in the correct order.
16+
17+
To quickly get up an running and view the test page in a web browser, you can use the [local-web-server](https://www.npmjs.com/package/local-web-server) package.
18+
19+
```
20+
npm install -g local-web-server
21+
```
22+
23+
Then change to the geo directory and run `ws`. You should now be able to view the test page by going to: http://localhost:8000/test/test.html
24+
1325
## Submitting pull requests
1426

1527
1. Create a new branch, please do not work in your `master` branch directly.
@@ -20,15 +32,15 @@ Please follow jQuery Foundation [JavaScript Style Guide](http://contribute.jquer
2032

2133
## Building with grunt
2234

23-
* install node.js ~0.8
35+
* install node.js v8+
2436
* install grunt-cli ([info](http://gruntjs.com/getting-started#installing-the-cli)):
2537

2638
```
2739
npm install -g grunt-cli
2840
```
2941

30-
* uninstall versions of grunt < 0.4.1
31-
* install grunt 0.4.1 locally into your project folder ([info](http://gruntjs.com/getting-started#working-with-an-existing-grunt-project)):
42+
* uninstall versions of grunt < 0.4
43+
* install grunt 0.4.5 locally into your project folder ([info](http://gruntjs.com/getting-started#working-with-an-existing-grunt-project)):
3244

3345
```
3446
cd path/to/geo
@@ -50,5 +62,5 @@ npm install grunt-contrib-jshint
5062
grunt
5163
```
5264

53-
Unless you have downloaded a tagged release, grunt will create a test version of jQuery Geo: dist/jquery.geo-1.0.0-test.min.js
65+
Grunt will build the current version of jQuery Geo in the dist folder, e.g., dist/jquery.geo-1.0.0.min.js
5466

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ $( '#map' ).geomap( );
3030
```html
3131
<div id="map" style="height: 480px;"></div>
3232
<script src="node_modules/jquery/dist/jquery.min.js"></script>
33-
<script src="node_modules/jquery.geo/dist/jquery.geo-1.0.0-rc1.1.min.js"></script>
33+
<script src="node_modules/jquery.geo/dist/jquery.geo.min.js"></script>
3434
<script>
3535
$(function() {
3636
$( "#map" ).geomap( );
@@ -44,8 +44,8 @@ The following copy-and-paste snippet will help you get started.
4444

4545
```html
4646
<div id="map" style="height: 480px;"></div>
47-
<script src="http://code.jquery.com/jquery-2.2.4.min.js"></script>
48-
<script src="http://code.jquerygeo.com/jquery.geo-1.0.0-rc1.1.min.js"></script>
47+
<script src="http://code.jquery.com/jquery-3.3.1.min.js"></script>
48+
<script src="http://code.jquerygeo.com/jquery.geo-1.1.0.min.js"></script>
4949
<script>
5050
$(function() {
5151
$( "#map" ).geomap( );
@@ -57,8 +57,8 @@ The following copy-and-paste snippet will help you get started.
5757

5858
You can also download the latest release as a [minified JavaScript file][min] or a [full, uncompressed one][max].
5959

60-
[min]: http://code.jquerygeo.com/jquery.geo-1.0.0-rc1.1.min.js
61-
[max]: http://code.jquerygeo.com/jquery.geo-1.0.0-rc1.1.js
60+
[min]: http://code.jquerygeo.com/jquery.geo-1.1.0.min.js
61+
[max]: http://code.jquerygeo.com/jquery.geo-1.1.0.js
6262

6363
## Documentation
6464

0 commit comments

Comments
 (0)