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

Commit 9696ee6

Browse files
author
Quentin de Bruyn
committed
Leaflet.label plugin removed.
Referencing tooltip from leaflet core.
1 parent cd7a93f commit 9696ee6

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
@@ -415,18 +415,6 @@ angular.module('ui-leaflet').service('leafletHelpers', function ($q, $log, $time
415415
}
416416
}
417417
},
418-
LabelPlugin: {
419-
isLoaded: function() {
420-
return angular.isDefined(L.Label);
421-
},
422-
is: function(layer) {
423-
if (this.isLoaded()) {
424-
return layer instanceof L.MarkerClusterGroup;
425-
} else {
426-
return false;
427-
}
428-
}
429-
},
430418
MarkerClusterPlugin: {
431419
isLoaded: function() {
432420
return angular.isDefined(L.MarkerClusterGroup);

‎src/services/leafletMarkersHelpers.js

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

235-
if (Helpers.LabelPlugin.isLoaded() && isDefined(markerData.label)) {
235+
if (isDefined(markerData.label)) {
236236
if (isDefined(markerData.label.options) && markerData.label.options.noHide === true) {
237237
marker.showLabel();
238238
}
@@ -380,24 +380,23 @@ angular.module('ui-leaflet').service('leafletMarkersHelpers', function ($rootSco
380380
marker.unbindPopup();
381381
}
382382

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

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

0 commit comments

Comments
 (0)