Skip to content
This repository was archived by the owner on Nov 30, 2018. It is now read-only.

Commit c67d8b1

Browse files
committed
re-bundled the google-maps-utility-library-v3 due to async loading of
google maps issues. It just makes my life easier for now.
1 parent cb667cb commit c67d8b1

6 files changed

+3086
-11
lines changed

dist/angular-google-maps-street-view_dev_mapped.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-google-maps.js

+3,063-1
Large diffs are not rendered by default.

dist/angular-google-maps.min.js

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/example.html

+6-1
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,12 @@ <h2>angular-google-maps: <span ng-cloak>{{version}}</span>, google-maps: <span n
466466

467467
<script src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/4.0.1/lodash.js" type="text/javascript"></script>
468468
<script src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.5.0/angular.js"></script>
469-
<script src="http://cdn.rawgit.com/nmccready/angular-simple-logger/0.0.1/dist/index.js"></script>
469+
<script src="http://cdn.rawgit.com/nmccready/angular-simple-logger/master/dist/angular-simple-logger.js"></script>
470+
<!-- <script src="http://cdn.rawgit.com/nmccready/google-maps-utility-library-v3-infobox/master/dist/infobox.js"></script>
471+
<script src="http://cdn.rawgit.com/nmccready/google-maps-utility-library-v3-keydragzoom/master/dist/keydragzoom.js"></script>
472+
<script src="http://cdn.rawgit.com/nmccready/google-maps-utility-library-v3-markerwithlabel/master/dist/markerwithlabel.js"></script>
473+
<script src="http://cdn.rawgit.com/googlemaps/js-rich-marker/gh-pages/src/richmarker.js"></script>
474+
<script src="http://cdn.rawgit.com/mahnunchik/markerclustererplus/master/dist/markerclusterer.min.js"></script> -->
470475
<script src="../dist/angular-google-maps.js"></script>
471476
<script src="./assets/scripts/mocks/heat-layer.js"></script>
472477
<script src="./assets/scripts/controllers/example.js"></script>

grunt/options/concat.coffee

+8-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,14 @@ module.exports =
4545
dist: concatDist
4646
distMapped: concatDistMapped
4747
libs:
48-
src: ["curl_components/**/*.js"]
48+
# NOTE: need to figure out how to make these optional in the examples so they are not bundled
49+
src: [
50+
'node_modules/markerclustererplus/dist/markerclusterer.min.js'
51+
'node_modules/google-maps-utility-library-v3-infobox/dist/infobox.js'
52+
'node_modules/google-maps-utility-library-v3-keydragzoom/dist/keydragzoom.js'
53+
'node_modules/google-maps-utility-library-v3-markerwithlabel/dist/markerwithlabel.js'
54+
'bower_components/js-rich-marker/src/richmarker.js'
55+
]
4956
dest: "tmp/gmaps_sdk_util_v3.js"
5057
streetview: concatStreetView
5158
streetviewMapped: concatStreetViewMapped

karma.conf.coffee

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ module.exports = (config) ->
3333
'dist/angular-google-maps.js'
3434
'spec/coffee/bootstrap/bootstrap.coffee'
3535
'spec/coffee/bootstrap/google-api-mock.coffee'
36-
'node_modules/markerclustererplus/dist/markerclusterer.min.js'
37-
'node_modules/google-maps-utility-library-v3-infobox/dist/infobox.js'
38-
'node_modules/google-maps-utility-library-v3-keydragzoom/dist/keydragzoom.js'
39-
'node_modules/google-maps-utility-library-v3-markerwithlabel/dist/markerwithlabel.js'
40-
'bower_components/js-rich-marker/src/richmarker.js'
36+
# 'node_modules/markerclustererplus/dist/markerclusterer.min.js'
37+
# 'node_modules/google-maps-utility-library-v3-infobox/dist/infobox.js'
38+
# 'node_modules/google-maps-utility-library-v3-keydragzoom/dist/keydragzoom.js'
39+
# 'node_modules/google-maps-utility-library-v3-markerwithlabel/dist/markerwithlabel.js'
40+
# 'bower_components/js-rich-marker/src/richmarker.js'
4141
'spec/coffee/bootstrap/initiator.coffee'
4242
#do not include those specs for jasmine html runner by karma kama_jasmine_runner.html
4343
{pattern:'*coffee', included: false}

0 commit comments

Comments
 (0)