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

Commit cdedcff

Browse files
committed
Merge pull request #18 from phillipj/fix/update-bower
Fix for for using bower >= v1.0
2 parents 9e01b0d + ed381e8 commit cdedcff

File tree

4 files changed

+9
-22
lines changed

4 files changed

+9
-22
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
node_modules
2-
components
2+
bower_components

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ before_install:
99
- npm install -g bower grunt-cli
1010
- npm install
1111
- bower install
12-
before_script: components/angular-ui-docs/.travis/before_script.sh
12+
before_script: bower_components/angular-ui-docs/.travis/before_script.sh
1313
script: grunt
14-
after_success: components/angular-ui-docs/.travis/after_success.sh
14+
after_success: bower_components/angular-ui-docs/.travis/after_success.sh
1515
branches:
1616
only:
1717
- master

test/googlemaps.js

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,8 @@
1-
window.google = window.google || {};
2-
google.maps = google.maps || {};
3-
(function() {
4-
1+
(function() {
52
function getScript(src) {
63
document.write('<' + 'script src="' + src + '"' +
74
' type="text/javascript"><' + '/script>');
85
}
9-
10-
var modules = google.maps.modules = {};
11-
google.maps.__gjsload__ = function(name, text) {
12-
modules[name] = text;
13-
};
14-
15-
google.maps.Load = function(apiLoad) {
16-
delete google.maps.Load;
17-
apiLoad([null,[[["http://mt0.googleapis.com/vt?lyrs=m@180000000\u0026src=api\u0026hl=en-US\u0026","http://mt1.googleapis.com/vt?lyrs=m@180000000\u0026src=api\u0026hl=en-US\u0026"],null,null,null,null,"m@180000000"],[["http://khm0.googleapis.com/kh?v=115\u0026hl=en-US\u0026","http://khm1.googleapis.com/kh?v=115\u0026hl=en-US\u0026"],null,null,null,1,"115"],[["http://mt0.googleapis.com/vt?lyrs=h@180000000\u0026src=api\u0026hl=en-US\u0026","http://mt1.googleapis.com/vt?lyrs=h@180000000\u0026src=api\u0026hl=en-US\u0026"],null,null,"imgtp=png32\u0026",null,"h@180000000"],[["http://mt0.googleapis.com/vt?lyrs=t@129,r@180000000\u0026src=api\u0026hl=en-US\u0026","http://mt1.googleapis.com/vt?lyrs=t@129,r@180000000\u0026src=api\u0026hl=en-US\u0026"],null,null,null,null,"t@129,r@180000000"],null,[[null,0,7,7,[[[330000000,1246050000],[386200000,1293600000]],[[366500000,1297000000],[386200000,1320034790]]],["http://mt0.gmaptiles.co.kr/mt?v=kr1.16\u0026hl=en-US\u0026","http://mt1.gmaptiles.co.kr/mt?v=kr1.16\u0026hl=en-US\u0026"]],[null,0,8,8,[[[330000000,1246050000],[386200000,1279600000]],[[345000000,1279600000],[386200000,1286700000]],[[354690000,1286700000],[386200000,1320035000]]],["http://mt0.gmaptiles.co.kr/mt?v=kr1.16\u0026hl=en-US\u0026","http://mt1.gmaptiles.co.kr/mt?v=kr1.16\u0026hl=en-US\u0026"]],[null,0,9,9,[[[330000000,1246050000],[386200000,1279600000]],[[340000000,1279600000],[386200000,1286700000]],[[348900000,1286700000],[386200000,1302000000]],[[368300000,1302000000],[386200000,1320035000]]],["http://mt0.gmaptiles.co.kr/mt?v=kr1.16\u0026hl=en-US\u0026","http://mt1.gmaptiles.co.kr/mt?v=kr1.16\u0026hl=en-US\u0026"]],[null,0,10,19,[[[329890840,1246055600],[386930130,1284960940]],[[344646740,1284960940],[386930130,1288476560]],[[350277470,1288476560],[386930130,1310531620]],[[370277730,1310531620],[386930130,1320034790]]],["http://mt0.gmaptiles.co.kr/mt?v=kr1.16\u0026hl=en-US\u0026","http://mt1.gmaptiles.co.kr/mt?v=kr1.16\u0026hl=en-US\u0026"]],[null,3,7,7,[[[330000000,1246050000],[386200000,1293600000]],[[366500000,1297000000],[386200000,1320034790]]],["http://mt0.gmaptiles.co.kr/mt?v=kr1p.16\u0026hl=en-US\u0026","http://mt1.gmaptiles.co.kr/mt?v=kr1p.16\u0026hl=en-US\u0026"]],[null,3,8,8,[[[330000000,1246050000],[386200000,1279600000]],[[345000000,1279600000],[386200000,1286700000]],[[354690000,1286700000],[386200000,1320035000]]],["http://mt0.gmaptiles.co.kr/mt?v=kr1p.16\u0026hl=en-US\u0026","http://mt1.gmaptiles.co.kr/mt?v=kr1p.16\u0026hl=en-US\u0026"]],[null,3,9,9,[[[330000000,1246050000],[386200000,1279600000]],[[340000000,1279600000],[386200000,1286700000]],[[348900000,1286700000],[386200000,1302000000]],[[368300000,1302000000],[386200000,1320035000]]],["http://mt0.gmaptiles.co.kr/mt?v=kr1p.16\u0026hl=en-US\u0026","http://mt1.gmaptiles.co.kr/mt?v=kr1p.16\u0026hl=en-US\u0026"]],[null,3,10,null,[[[329890840,1246055600],[386930130,1284960940]],[[344646740,1284960940],[386930130,1288476560]],[[350277470,1288476560],[386930130,1310531620]],[[370277730,1310531620],[386930130,1320034790]]],["http://mt0.gmaptiles.co.kr/mt?v=kr1p.16\u0026hl=en-US\u0026","http://mt1.gmaptiles.co.kr/mt?v=kr1p.16\u0026hl=en-US\u0026"]]],[["http://cbk0.googleapis.com/cbk?","http://cbk1.googleapis.com/cbk?"]],[["http://khm0.googleapis.com/kh?v=60\u0026hl=en-US\u0026","http://khm1.googleapis.com/kh?v=60\u0026hl=en-US\u0026"],null,null,null,null,"60"],[["http://mt0.googleapis.com/mapslt?hl=en-US\u0026","http://mt1.googleapis.com/mapslt?hl=en-US\u0026"]],[["http://mt0.googleapis.com/mapslt/ft?hl=en-US\u0026","http://mt1.googleapis.com/mapslt/ft?hl=en-US\u0026"]],[["http://mt0.googleapis.com/vt?hl=en-US\u0026","http://mt1.googleapis.com/vt?hl=en-US\u0026"]]],["en-US","US",null,0,null,null,"http://maps.gstatic.com/mapfiles/","http://csi.gstatic.com","https://maps.googleapis.com","http://maps.googleapis.com"],["http://maps.gstatic.com/intl/en_us/mapfiles/api-3/9/12","3.9.12"],[4027454879],1.0,null,null,null,null,0,"",null,null,0,"http://khm.googleapis.com/mz?v=115\u0026",null,"https://earthbuilder.google.com","https://earthbuilder.googleapis.com"], loadScriptTime);
18-
};
19-
var loadScriptTime = (new Date).getTime();
20-
getScript("http://maps.gstatic.com/intl/en_us/mapfiles/api-3/9/12/main.js");
6+
7+
getScript("http://maps.googleapis.com/maps/api/js?sensor=false");
218
})();

test/karma.conf.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ basePath = '..';
1010
files = [
1111
JASMINE,
1212
JASMINE_ADAPTER,
13-
'components/angular/angular.js',
14-
'components/angular-mocks/angular-mocks.js',
15-
'components/angular-ui-utils/modules/event/event.js',
13+
'bower_components/angular/angular.js',
14+
'bower_components/angular-mocks/angular-mocks.js',
15+
'bower_components/angular-ui-utils/modules/event/event.js',
1616
'ui-map.js',
1717
'test/googlemaps.js',
1818
'test/*Spec.js'

0 commit comments

Comments
 (0)