Skip to content
This repository has been archived by the owner on Mar 28, 2022. It is now read-only.

Commit

Permalink
Update build and changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobtoye committed Jun 21, 2014
1 parent 08b31ca commit c6b1ce1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 5 additions & 2 deletions dist/leaflet.label-src.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/

Expand Down Expand Up @@ -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();
Expand All @@ -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);
}
},

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion dist/leaflet.label.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c6b1ce1

Please sign in to comment.