Skip to content

Commit 84786b2

Browse files
committed
Version 1.17.2
1 parent d7d236e commit 84786b2

File tree

4 files changed

+63
-55
lines changed

4 files changed

+63
-55
lines changed

build/docs/source/ngmap.custom-marker.html

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -298,21 +298,23 @@ <h1 class="title">
298298
element[0].style.display = 'none';
299299
console.log("custom-marker options", options);
300300
var customMarker = new CustomMarker(options);
301-
scope.$watch('[' + varsToWatch.join(',') + ']', function() {
302-
customMarker.setContent(orgHtml, scope);
303-
}, true);
304-
customMarker.setContent(element[0].innerHTML, scope);
305-
var classNames = element[0].firstElementChild.className;
306-
customMarker.addClass('custom-marker');
307-
customMarker.addClass(classNames);
308-
console.log('customMarker', customMarker, 'classNames', classNames);
309-
if (!(options.position instanceof google.maps.LatLng)) {
310-
NgMap.getGeoLocation(options.position).then(
311-
function(latlng) {
312-
customMarker.setPosition(latlng);
313-
}
314-
);
315-
}
301+
$timeout(function() { //apply contents, class, and location after it is compiled
302+
scope.$watch('[' + varsToWatch.join(',') + ']', function() {
303+
customMarker.setContent(orgHtml, scope);
304+
}, true);
305+
customMarker.setContent(element[0].innerHTML, scope);
306+
var classNames = element[0].firstElementChild.className;
307+
customMarker.addClass('custom-marker');
308+
customMarker.addClass(classNames);
309+
console.log('customMarker', customMarker, 'classNames', classNames);
310+
if (!(options.position instanceof google.maps.LatLng)) {
311+
NgMap.getGeoLocation(options.position).then(
312+
function(latlng) {
313+
customMarker.setPosition(latlng);
314+
}
315+
);
316+
}
317+
});
316318
console.log("custom-marker events", "events");
317319
for (var eventName in events) { /* jshint ignore:line */
318320
google.maps.event.addDomListener(

build/scripts/ng-map.debug.js

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* AngularJS Google Maps Ver. 1.17.0
2+
* AngularJS Google Maps Ver. 1.17.1
33
*
44
* The MIT License (MIT)
55
*
@@ -582,24 +582,27 @@ angular.module('ngMap', []);
582582
console.log("custom-marker options", options);
583583
var customMarker = new CustomMarker(options);
584584

585-
586-
scope.$watch('[' + varsToWatch.join(',') + ']', function() {
587-
customMarker.setContent(orgHtml, scope);
588-
}, true);
589-
590-
customMarker.setContent(element[0].innerHTML, scope);
591-
var classNames = element[0].firstElementChild.className;
592-
customMarker.addClass('custom-marker');
593-
customMarker.addClass(classNames);
594-
console.log('customMarker', customMarker, 'classNames', classNames);
595-
596-
if (!(options.position instanceof google.maps.LatLng)) {
597-
NgMap.getGeoLocation(options.position).then(
598-
function(latlng) {
599-
customMarker.setPosition(latlng);
600-
}
601-
);
602-
}
585+
$timeout(function() { //apply contents, class, and location after it is compiled
586+
587+
scope.$watch('[' + varsToWatch.join(',') + ']', function() {
588+
customMarker.setContent(orgHtml, scope);
589+
}, true);
590+
591+
customMarker.setContent(element[0].innerHTML, scope);
592+
var classNames = element[0].firstElementChild.className;
593+
customMarker.addClass('custom-marker');
594+
customMarker.addClass(classNames);
595+
console.log('customMarker', customMarker, 'classNames', classNames);
596+
597+
if (!(options.position instanceof google.maps.LatLng)) {
598+
NgMap.getGeoLocation(options.position).then(
599+
function(latlng) {
600+
customMarker.setPosition(latlng);
601+
}
602+
);
603+
}
604+
605+
});
603606

604607
console.log("custom-marker events", "events");
605608
for (var eventName in events) { /* jshint ignore:line */

build/scripts/ng-map.js

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ factory(root.angular);
88
}
99
}(this, function(angular) {
1010
/**
11-
* AngularJS Google Maps Ver. 1.17.0
11+
* AngularJS Google Maps Ver. 1.17.1
1212
*
1313
* The MIT License (MIT)
1414
*
@@ -591,24 +591,27 @@ angular.module('ngMap', []);
591591
void 0;
592592
var customMarker = new CustomMarker(options);
593593

594-
595-
scope.$watch('[' + varsToWatch.join(',') + ']', function() {
596-
customMarker.setContent(orgHtml, scope);
597-
}, true);
598-
599-
customMarker.setContent(element[0].innerHTML, scope);
600-
var classNames = element[0].firstElementChild.className;
601-
customMarker.addClass('custom-marker');
602-
customMarker.addClass(classNames);
603-
void 0;
604-
605-
if (!(options.position instanceof google.maps.LatLng)) {
606-
NgMap.getGeoLocation(options.position).then(
607-
function(latlng) {
608-
customMarker.setPosition(latlng);
609-
}
610-
);
611-
}
594+
$timeout(function() { //apply contents, class, and location after it is compiled
595+
596+
scope.$watch('[' + varsToWatch.join(',') + ']', function() {
597+
customMarker.setContent(orgHtml, scope);
598+
}, true);
599+
600+
customMarker.setContent(element[0].innerHTML, scope);
601+
var classNames = element[0].firstElementChild.className;
602+
customMarker.addClass('custom-marker');
603+
customMarker.addClass(classNames);
604+
void 0;
605+
606+
if (!(options.position instanceof google.maps.LatLng)) {
607+
NgMap.getGeoLocation(options.position).then(
608+
function(latlng) {
609+
customMarker.setPosition(latlng);
610+
}
611+
);
612+
}
613+
614+
});
612615

613616
void 0;
614617
for (var eventName in events) { /* jshint ignore:line */

build/scripts/ng-map.min.js

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

0 commit comments

Comments
 (0)