Skip to content

Commit 648ce77

Browse files
committed
Merge pull request tombatossals#692 from idrakimuhamad/master
Missing `leafletEventsHelpers` in the `leafletPathEvents` factory
2 parents 1dec14e + 5c26810 commit 648ce77

File tree

5 files changed

+17
-14
lines changed

5 files changed

+17
-14
lines changed

dist/angular-leaflet-directive.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* angular-leaflet-directive 0.7.13 2015-04-14
2+
* angular-leaflet-directive 0.7.13 2015-04-17
33
* angular-leaflet-directive - An AngularJS directive to easily interact with Leaflet maps
44
* git: https://github.com/tombatossals/angular-leaflet-directive
55
*/
@@ -1879,7 +1879,7 @@ angular.module("leaflet-directive")
18791879
if (isDefined(markerData.label.options) && markerData.label.options.noHide === true) {
18801880
marker.showLabel();
18811881
}
1882-
if (compileMessage) {
1882+
if (compileMessage && marker.label != null) {
18831883
$compile(marker.label._container)(labelScope);
18841884
}
18851885
}
@@ -4410,13 +4410,14 @@ angular.module("leaflet-directive")
44104410
}]);
44114411

44124412
angular.module("leaflet-directive")
4413-
.factory('leafletPathEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "leafletLabelEvents", function ($rootScope, $q, $log, leafletHelpers, leafletLabelEvents) {
4413+
.factory('leafletPathEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "leafletLabelEvents", "leafletEventsHelpers", function ($rootScope, $q, $log, leafletHelpers, leafletLabelEvents, leafletEventsHelpers) {
44144414
var safeApply = leafletHelpers.safeApply,
44154415
isDefined = leafletHelpers.isDefined,
44164416
isObject = leafletHelpers.isObject,
44174417
Helpers = leafletHelpers,
44184418
errorHeader = leafletHelpers.errorHeader,
4419-
lblHelp = leafletLabelEvents;
4419+
lblHelp = leafletLabelEvents,
4420+
fire = leafletEventsHelpers.fire;
44204421

44214422
var _genDispatchPathEvent = function (eventName, logic, leafletScope, lObject, name, model, layerName) {
44224423
return function (e) {

dist/angular-leaflet-directive.min.js

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

dist/angular-leaflet-directive_dev_mapped.js

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

dist/angular-leaflet-directive_dev_mapped.js.map

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

src/services/events/leafletPathEvents.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
angular.module("leaflet-directive")
2-
.factory('leafletPathEvents', function ($rootScope, $q, $log, leafletHelpers, leafletLabelEvents) {
2+
.factory('leafletPathEvents', function ($rootScope, $q, $log, leafletHelpers, leafletLabelEvents, leafletEventsHelpers) {
33
var safeApply = leafletHelpers.safeApply,
44
isDefined = leafletHelpers.isDefined,
55
isObject = leafletHelpers.isObject,
66
Helpers = leafletHelpers,
77
errorHeader = leafletHelpers.errorHeader,
8-
lblHelp = leafletLabelEvents;
8+
lblHelp = leafletLabelEvents,
9+
fire = leafletEventsHelpers.fire;
910

1011
var _genDispatchPathEvent = function (eventName, logic, leafletScope, lObject, name, model, layerName) {
1112
return function (e) {

0 commit comments

Comments
 (0)