Skip to content

Commit c2482e6

Browse files
committed
dist/ files
1 parent 29dca56 commit c2482e6

File tree

41 files changed

+65
-56
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+65
-56
lines changed

dist/angular-google-maps-street-view.js

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! angular-google-maps 2.1.5 2015-06-18
1+
/*! angular-google-maps 2.1.5 2015-07-28
22
* AngularJS directives for Google Maps
33
* git: https://github.com/angular-ui/angular-google-maps.git
44
*/

dist/angular-google-maps-street-view.min.js

100755100644
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

100755100644
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

100755100644
File mode changed.

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

100755100644
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

100755100644
File mode changed.

dist/angular-google-maps.js

100755100644
Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! angular-google-maps 2.1.5 2015-06-18
1+
/*! angular-google-maps 2.1.5 2015-07-28
22
* AngularJS directives for Google Maps
33
* git: https://github.com/angular-ui/angular-google-maps.git
44
*/
@@ -1142,22 +1142,19 @@ Nicholas McCready - https://twitter.com/nmccready
11421142
;(function() {
11431143
angular.module('uiGmapgoogle-maps.directives.api.utils').service('uiGmapIsReady', [
11441144
'$q', '$timeout', function($q, $timeout) {
1145-
var _checkIfReady, _ctr, _currentCheckNum, _maxCtrChecks, _promises, _proms;
1145+
var _checkIfReady, _ctr, _promises, _proms;
11461146
_ctr = 0;
11471147
_proms = [];
1148-
_currentCheckNum = 1;
1149-
_maxCtrChecks = 50;
11501148
_promises = function() {
11511149
return $q.all(_proms);
11521150
};
1153-
_checkIfReady = function(deferred, expectedInstances) {
1151+
_checkIfReady = function(deferred, expectedInstances, retriesLeft) {
11541152
return $timeout(function() {
1155-
if (_currentCheckNum >= _maxCtrChecks) {
1153+
if (retriesLeft <= 0) {
11561154
deferred.reject('Your maps are not found we have checked the maximum amount of times. :)');
11571155
}
1158-
_currentCheckNum += 1;
11591156
if (_ctr !== expectedInstances) {
1160-
return _checkIfReady(deferred, expectedInstances);
1157+
return _checkIfReady(deferred, expectedInstances, retriesLeft - 1);
11611158
} else {
11621159
return deferred.resolve(_promises());
11631160
}
@@ -1178,13 +1175,16 @@ Nicholas McCready - https://twitter.com/nmccready
11781175
instances: function() {
11791176
return _ctr;
11801177
},
1181-
promise: function(expectedInstances) {
1178+
promise: function(expectedInstances, numRetries) {
11821179
var d;
11831180
if (expectedInstances == null) {
11841181
expectedInstances = 1;
11851182
}
1183+
if (numRetries == null) {
1184+
numRetries = 50;
1185+
}
11861186
d = $q.defer();
1187-
_checkIfReady(d, expectedInstances);
1187+
_checkIfReady(d, expectedInstances, numRetries);
11881188
return d.promise;
11891189
},
11901190
reset: function() {
@@ -1436,7 +1436,7 @@ Nicholas McCready - https://twitter.com/nmccready
14361436
}
14371437
return ret;
14381438
};
1439-
scopeProp = scope[key];
1439+
scopeProp = _.get(scope, key);
14401440
if (_.isFunction(scopeProp)) {
14411441
return maybeWrap(true, scopeProp(model), doWrap);
14421442
}
@@ -1448,9 +1448,9 @@ Nicholas McCready - https://twitter.com/nmccready
14481448
}
14491449
modelKey = scopeProp;
14501450
if (!modelKey) {
1451-
modelProp = model[key];
1451+
modelProp = _.get(model, key);
14521452
} else {
1453-
modelProp = modelKey === 'self' ? model : model[modelKey];
1453+
modelProp = modelKey === 'self' ? model : _.get(model, modelKey);
14541454
}
14551455
if (_.isFunction(modelProp)) {
14561456
return maybeWrap(false, modelProp(), doWrap);
@@ -7405,6 +7405,10 @@ This directive creates a new scope.
74057405
SearchBox.prototype.link = function(scope, element, attrs, mapCtrl) {
74067406
return GoogleMapApi.then((function(_this) {
74077407
return function(maps) {
7408+
if (scope.template == null) {
7409+
$templateCache.put('uigmap-searchbox-default.tpl.html', '<input type="text">');
7410+
scope.template = 'uigmap-searchbox-default.tpl.html';
7411+
}
74087412
return $http.get(scope.template, {
74097413
cache: $templateCache
74107414
}).success(function(template) {
@@ -12454,7 +12458,7 @@ window['RichMarkerPosition'] = RichMarkerPosition;
1245412458

1245512459
/***/ },
1245612460
/* 2 */
12457-
/***/ function(module, exports, __webpack_require__) {
12461+
/***/ function(module, exports) {
1245812462

1245912463
/*
1246012464
Graph implemented as a modified incidence list. O(1) for every typical
@@ -12748,7 +12752,7 @@ window['RichMarkerPosition'] = RichMarkerPosition;
1274812752

1274912753
/***/ },
1275012754
/* 3 */
12751-
/***/ function(module, exports, __webpack_require__) {
12755+
/***/ function(module, exports) {
1275212756

1275312757
/*
1275412758
Minimum heap, i.e. smallest node at root.
@@ -12895,7 +12899,7 @@ window['RichMarkerPosition'] = RichMarkerPosition;
1289512899

1289612900
/***/ },
1289712901
/* 4 */
12898-
/***/ function(module, exports, __webpack_require__) {
12902+
/***/ function(module, exports) {
1289912903

1290012904
/*
1290112905
Doubly Linked.
@@ -13172,7 +13176,7 @@ window['RichMarkerPosition'] = RichMarkerPosition;
1317213176

1317313177
/***/ },
1317413178
/* 5 */
13175-
/***/ function(module, exports, __webpack_require__) {
13179+
/***/ function(module, exports) {
1317613180

1317713181
/*
1317813182
Kind of a stopgap measure for the upcoming [JavaScript
@@ -13363,7 +13367,7 @@ window['RichMarkerPosition'] = RichMarkerPosition;
1336313367

1336413368
/***/ },
1336513369
/* 6 */
13366-
/***/ function(module, exports, __webpack_require__) {
13370+
/***/ function(module, exports) {
1336713371

1336813372
/*
1336913373
Amortized O(1) dequeue!
@@ -13455,7 +13459,7 @@ window['RichMarkerPosition'] = RichMarkerPosition;
1345513459

1345613460
/***/ },
1345713461
/* 7 */
13458-
/***/ function(module, exports, __webpack_require__) {
13462+
/***/ function(module, exports) {
1345913463

1346013464
/*
1346113465
Credit to Wikipedia's article on [Red-black

dist/angular-google-maps.min.js

100755100644
Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-google-maps_dev_mapped.js

100755100644
Lines changed: 23 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-google-maps_dev_mapped.js.map

100755100644
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)