Permalink
Browse files

Update build and changelog

  • Loading branch information...
jacobtoye committed Jun 21, 2014
1 parent 08b31ca commit c6b1ce19ac819b5f72169f0c04cb4448ff94b40d
Showing with 8 additions and 3 deletions.
  1. +2 −0 CHANGELOG.md
  2. +5 −2 dist/leaflet.label-src.js
  3. +1 −1 dist/leaflet.label.js
View
@@ -8,6 +8,8 @@ An in-progress version being developed on the master branch.
### Plugin improvements
* Disable pointer-events for the label to fix flashing label issue. (by [@iandees](https://github.com/iandees)) [#70](https://github.com/Leaflet/Leaflet.label/pull/70)
* Close open labels (except when in noHide mode) on touch devices when tap map.
* Add an option to allow configuration of the Leaflet `pane` to insert the label element into. (by [@perliedman](https://github.com/perliedman)) [#81](https://github.com/Leaflet/Leaflet.label/pull/81)
### Bug fixes
@@ -7,7 +7,7 @@
https://github.com/jacobtoye
*/
(function (window, document, undefined) {
/*
var L = window.L;/*
* Leaflet.label assumes that you have already included the Leaflet library.
*/
@@ -38,7 +38,8 @@ L.Label = L.Class.extend({
onAdd: function (map) {
this._map = map;
this._pane = this._source instanceof L.Marker ? map._panes.markerPane : map._panes.popupPane;
this._pane = this.options.pane ? map._panes[this.options.pane] :
this._source instanceof L.Marker ? map._panes.markerPane : map._panes.popupPane;
if (!this._container) {
this._initLayout();
@@ -62,6 +63,7 @@ L.Label = L.Class.extend({
if (L.Browser.touch && !this.options.noHide) {
L.DomEvent.on(this._container, 'click', this.close, this);
map.on('click', this.close, this);
}
},
@@ -103,6 +105,7 @@ L.Label = L.Class.extend({
if (map) {
if (L.Browser.touch && !this.options.noHide) {
L.DomEvent.off(this._container, 'click', this.close);
map.off('click', this.close, this);
}
map.removeLayer(this);
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

0 comments on commit c6b1ce1

Please sign in to comment.