Skip to content
This repository has been archived by the owner on Sep 25, 2019. It is now read-only.

Fix cluster images #100

Merged
merged 3 commits into from
Jun 16, 2016
Merged

Fix cluster images #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f37f22
fix(map): cluster icons broken by change to Google CDN
Splaktar Jun 15, 2016
1dea336
fix(map): update for new angular-google-maps library
Splaktar Jun 16, 2016
e8d771a
fix(map): update for new angular-google-maps library
Splaktar Jun 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"angular-route": "1.4.8",
"angular-material": "1.0.0-rc5",
"angular-google-chart": "0.0.11",
"angular-google-maps": "2.3.2",
"angular-google-maps": "2.3.3",
"font-awesome": "4.3.0",
"ngGeolocation": "0.0.8",
"lodash": "3.9.3",
Expand Down
8 changes: 8 additions & 0 deletions client/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@

<firefly-footer tag="tag" layout></firefly-footer>

<!-- Hack to fix exceptions caused by latest version of angular-google-maps -->
<script src="https://maps.googleapis.com/maps/api/js"></script>

<!--[if lt IE 9]>
<script src="bower_components/es5-shim/es5-shim.js"></script>
<script src="bower_components/json3/lib/json3.min.js"></script>
Expand All @@ -71,6 +74,11 @@
<script src="bower_components/angular-google-chart/ng-google-chart.js"></script>
<script src="bower_components/angular-simple-logger/dist/angular-simple-logger.js"></script>
<script src="bower_components/lodash/lodash.js"></script>
<script src="bower_components/markerclustererplus/src/markerclusterer.js"></script>
<script src="bower_components/google-maps-utility-library-v3-markerwithlabel/dist/markerwithlabel.js"></script>
<script src="bower_components/google-maps-utility-library-v3-infobox/dist/infobox.js"></script>
<script src="bower_components/google-maps-utility-library-v3-keydragzoom/dist/keydragzoom.js"></script>
<script src="bower_components/js-rich-marker/src/richmarker.js"></script>
<script src="bower_components/angular-google-maps/dist/angular-google-maps.js"></script>
<script src="bower_components/ngGeolocation/ngGeolocation.min.js"></script>
<script src="bower_components/moment/moment.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"jit-grunt": "0.5.0",
"jshint-stylish": "0.1.5",
"karma": "0.13.22",
"karma-chrome-launcher": "0.2.2",
"karma-chrome-launcher": "1.0.1",
"karma-coffee-preprocessor": "0.2.1",
"karma-firefox-launcher": "0.1.7",
"karma-html2js-preprocessor": "0.1.0",
Expand Down