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

Commit 9a5fd05

Browse files
elesdoarelesdoar
committed
Merge branch 'leaflet-1.X' of github.com:angular-ui/ui-leaflet into leaflet-1.X
2 parents 49039f0 + 7e1834e commit 9a5fd05

File tree

7 files changed

+23
-36
lines changed

7 files changed

+23
-36
lines changed

‎src/directives/geojson.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ angular.module('ui-leaflet')
3737
onEachFeature = geojson.onEachFeature;
3838
} else {
3939
onEachFeature = function(feature, layer) {
40-
if (leafletHelpers.LabelPlugin.isLoaded() && isDefined(feature.properties.description)) {
41-
layer.bindLabel(feature.properties.description);
40+
if (isDefined(feature.properties.description)) {
41+
layer.bindTooltip(feature.properties.description);
4242
}
4343

4444
leafletGeoJsonEvents.bindEvents(attrs.id, layer, null, feature,

‎src/directives/markers.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ angular.module('ui-leaflet').directive('markers',
113113
}
114114

115115
// Show label if defined
116-
if (Helpers.LabelPlugin.isLoaded() && isDefined(model.label) && isDefined(model.label.message)) {
117-
marker.bindLabel(model.label.message, model.label.options);
116+
if (isDefined(model.label) && isDefined(model.label.message)) {
117+
marker.bindTooltip(model.label.message, model.label.options);
118118
}
119119

120120
// Check if the marker should be added to a layer

‎src/directives/paths.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ angular.module('ui-leaflet').directive('paths', function (leafletLogger, $q, lea
109109
}
110110

111111
// Show label if defined
112-
if (leafletHelpers.LabelPlugin.isLoaded() && isDefined(pathData.label) && isDefined(pathData.label.message)) {
113-
newPath.bindLabel(pathData.label.message, pathData.label.options);
112+
if (isDefined(pathData.label) && isDefined(pathData.label.message)) {
113+
newPath.bindTooltip(pathData.label.message, pathData.label.options);
114114
}
115115

116116
// Check if the marker should be added to a layer

‎src/services/events/leafletMarkerEvents.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ angular.module('ui-leaflet')
6060
MarkerEvents.prototype.bindEvents = function (maybeMapId, lObject, name, model, leafletScope, layerName) {
6161
var logic = EventsHelper.prototype.bindEvents.call(this, maybeMapId, lObject, name, model, leafletScope, layerName);
6262

63-
if (Helpers.LabelPlugin.isLoaded() && isDefined(lObject.label)) {
63+
if (isDefined(lObject.label)) {
6464
lblHelp.genEvents(maybeMapId, name, logic, leafletScope, lObject, model, layerName);
6565
}
6666
};

‎src/services/events/leafletPathEvents.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ angular.module('ui-leaflet')
120120
lObject.on(eventName, _genDispatchPathEvent(maybeMapId, eventName, logic, leafletScope, pathEvents, name));
121121
}
122122

123-
if (Helpers.LabelPlugin.isLoaded() && isDefined(lObject.label)) {
123+
if (isDefined(lObject.label)) {
124124
lblHelp.genEvents(maybeMapId, name, logic, leafletScope, lObject, model);
125125
}
126126
};

‎src/services/leafletHelpers.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -414,18 +414,6 @@ angular.module('ui-leaflet').service('leafletHelpers', function ($q, $log, $time
414414
}
415415
}
416416
},
417-
LabelPlugin: {
418-
isLoaded: function() {
419-
return angular.isDefined(L.Label);
420-
},
421-
is: function(layer) {
422-
if (this.isLoaded()) {
423-
return layer instanceof L.MarkerClusterGroup;
424-
} else {
425-
return false;
426-
}
427-
}
428-
},
429417
MarkerClusterPlugin: {
430418
isLoaded: function() {
431419
return angular.isDefined(L.MarkerClusterGroup);

‎src/services/leafletMarkersHelpers.js

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ angular.module('ui-leaflet').service('leafletMarkersHelpers', function ($rootSco
235235
labelScope = angular.isFunction(markerData.getLabelScope) ? markerData.getLabelScope() : markerScope,
236236
compileMessage = isDefined(markerData.compileMessage) ? markerData.compileMessage : true;
237237

238-
if (Helpers.LabelPlugin.isLoaded() && isDefined(markerData.label)) {
238+
if (isDefined(markerData.label)) {
239239
if (isDefined(markerData.label.options) && markerData.label.options.noHide === true) {
240240
marker.showLabel();
241241
}
@@ -383,24 +383,23 @@ angular.module('ui-leaflet').service('leafletMarkersHelpers', function ($rootSco
383383
marker.unbindPopup();
384384
}
385385

386-
// Update the label content or bind a new label if the old one has been removed.
387-
if (Helpers.LabelPlugin.isLoaded()) {
388-
if (isDefined(markerData.label) && isDefined(markerData.label.message)) {
389-
if ('label' in oldMarkerData && 'message' in oldMarkerData.label && !angular.equals(markerData.label.message, oldMarkerData.label.message)) {
390-
marker.updateLabelContent(markerData.label.message);
391-
} else if (!angular.isFunction(marker.getLabel) || angular.isFunction(marker.getLabel) && !isDefined(marker.getLabel())) {
392-
marker.bindLabel(markerData.label.message, markerData.label.options);
393-
_manageOpenLabel(marker, markerData);
394-
} else {
395-
_manageOpenLabel(marker, markerData);
396-
}
397-
} else if (!('label' in markerData && !('message' in markerData.label))) {
398-
if (angular.isFunction(marker.unbindLabel)) {
399-
marker.unbindLabel();
400-
}
386+
387+
if (isDefined(markerData.label) && isDefined(markerData.label.message)) {
388+
if ('label' in oldMarkerData && 'message' in oldMarkerData.label && !angular.equals(markerData.label.message, oldMarkerData.label.message)) {
389+
marker.setTooltipContent(markerData.label.message);
390+
} else if (!angular.isFunction(marker.getLabel) || angular.isFunction(marker.getLabel) && !isDefined(marker.getLabel())) {
391+
marker.bindTooltip(markerData.label.message, markerData.label.options);
392+
_manageOpenLabel(marker, markerData);
393+
} else {
394+
_manageOpenLabel(marker, markerData);
395+
}
396+
} else if (!('label' in markerData && !('message' in markerData.label))) {
397+
if (angular.isFunction(marker.unbindTooltip)) {
398+
marker.unbindTooltip();
401399
}
402400
}
403401

402+
404403
// There is some text in the popup, so we must show the text or update existing
405404
if (isString(markerData.message) && !isString(oldMarkerData.message)) {
406405
// There was no message before so we create it

0 commit comments

Comments
 (0)