Skip to content

Commit c2aa4a8

Browse files
committed
Update dependency documentation
1 parent f3b26be commit c2aa4a8

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

docs/quickstart.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ is needed. ::
5656

5757
Compiled javascript libraries will be named ``geo.min.js`` and ``geo.ext.min.js`` in ``dist/built``.
5858
The first file contains geojs and vgl bundled together with a number of dependent libraries.
59-
The second file contains jquery and d3. The bundled libraries are minified, but source maps are provided
59+
The second file contains d3. The bundled libraries are minified, but source maps are provided
6060

6161
.. _quick-start-guide:
6262

docs/users.rst

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,23 @@ list of libraries used by GeoJS.
2929
+---------------------------+------------+---------------------------+
3030
| `earcut`_ | 2.1 | GL polygon feature |
3131
+---------------------------+------------+---------------------------+
32+
| `jQuery`_ | 2.2 | Core |
33+
+---------------------------+------------+---------------------------+
3234

3335
.. table:: External GeoJS dependencies
3436

3537
+---------------------------+------------+---------------------------+
3638
| Library | Version | Component |
3739
+===========================+============+===========================+
38-
| `jQuery`_ | 2.2 | Core |
39-
+---------------------------+------------+---------------------------+
4040
| `d3`_ | 3.5 | D3 renderer, UI widgets |
4141
+---------------------------+------------+---------------------------+
4242

4343
.. note::
4444

45-
The versions listed are what is provided in the bundle, but other versions
46-
may work as well.
47-
48-
.. note::
49-
Components used in the core code are strictly required. Other components
50-
can be excluded, though some functions will not work without them.
45+
JQuery is now included in the distributed bundle. Internally, this
46+
version will always be used and exposed as ``geo.jQuery``. GeoJS
47+
will also set the global variable ``window.$`` if no other version
48+
is detected.
5149

5250
.. _jQuery: http://jquery.com/
5351
.. _proj4: http://proj4js.org/

0 commit comments

Comments
 (0)