ben/brouter-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update Leaflet to 1.4.0

Browse source
This commit is contained in:
Norbert Renner 2019-03-26 21:17:23 +01:00
parent 5a12879892
commit 98f80d90ca
3 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
js/control/LayersTab.js
View file

@ -14,7 +14,7 @@ BR.LayersTab = L.Control.Layers.extend({
var layerIndex = BR.layerIndex; var layerIndex = BR.layerIndex;
L.DomUtil.get('layers-control-wrapper').appendChild(this._form); L.DomUtil.get('layers-control-wrapper').appendChild(this._section);
this.initButtons(); this.initButtons();
@ -74,7 +74,7 @@ BR.LayersTab = L.Control.Layers.extend({
], ],
'Country': [ 'Country': [
'historic-place-contours', 'historic-place-contours',
'hu-hillshade', 'hu-hillshade',
{ {
'PL - Poland': [ 'PL - Poland': [
'mapaszlakow-cycle', 'mapaszlakow-cycle',
@ -146,7 +146,7 @@ BR.LayersTab = L.Control.Layers.extend({
plugins: [ 'checkbox' ], plugins: [ 'checkbox' ],
checkbox: { checkbox: {
whole_node: false, whole_node: false,
tie_selection: false tie_selection: false
}, },
core: { core: {
'multiple': false, 'multiple': false,
@ -214,7 +214,7 @@ BR.LayersTab = L.Control.Layers.extend({
// when key required only add if configured // when key required only add if configured
if (!keyObj || keyObj && BR.keys[keyObj.name]) { if (!keyObj || keyObj && BR.keys[keyObj.name]) {
childNode = { childNode = {
'id': id, 'id': id,
'text': props.name, 'text': props.name,
'state': { 'state': {
@ -333,7 +333,7 @@ BR.LayersTab = L.Control.Layers.extend({
}, },
onBaselayerchange: function () { onBaselayerchange: function () {
// execute after current input click handler, // execute after current input click handler,
// otherwise added overlay checkbox state doesn't update // otherwise added overlay checkbox state doesn't update
setTimeout(L.Util.bind(function () { setTimeout(L.Util.bind(function () {
this.removePreviewLayer(); this.removePreviewLayer();

2
package.json
View file

@ -33,7 +33,7 @@
"jquery": "3.3.1", "jquery": "3.3.1",
"jquery-i18next": "^1.2.1", "jquery-i18next": "^1.2.1",
"jstree": "^3.3.7", "jstree": "^3.3.7",
"leaflet": "~1.3.0", "leaflet": "~1.4.0",
"leaflet-control-geocoder": "~1.5.8", "leaflet-control-geocoder": "~1.5.8",
"leaflet-easybutton": "*", "leaflet-easybutton": "*",
"leaflet-editable": "^1.1.0", "leaflet-editable": "^1.1.0",

7
yarn.lock
View file

@ -3527,16 +3527,11 @@ leaflet.stravasegments@2.3.2:
leaflet-easybutton "^2.3.0" leaflet-easybutton "^2.3.0"
leaflet-triangle-marker "^1.0.1" leaflet-triangle-marker "^1.0.1"
leaflet@^1.0.1, leaflet@^1.3.4: leaflet@^1.0.1, leaflet@^1.3.4, leaflet@~1.4.0:
version "1.4.0" version "1.4.0"
resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.4.0.tgz#d5f56eeb2aa32787c24011e8be4c77e362ae171b" resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.4.0.tgz#d5f56eeb2aa32787c24011e8be4c77e362ae171b"
integrity sha512-x9j9tGY1+PDLN9pcWTx9/y6C5nezoTMB8BLK5jTakx+H7bPlnbCHfi9Hjg+Qt36sgDz/cb9lrSpNQXmk45Tvhw== integrity sha512-x9j9tGY1+PDLN9pcWTx9/y6C5nezoTMB8BLK5jTakx+H7bPlnbCHfi9Hjg+Qt36sgDz/cb9lrSpNQXmk45Tvhw==
leaflet@~1.3.0:
version "1.3.4"
resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.3.4.tgz#7f006ea5832603b53d7269ef5c595fd773060a40"
integrity sha512-FYL1LGFdj6v+2Ifpw+AcFIuIOqjNggfoLUwuwQv6+3sS21Za7Wvapq+LhbSE4NDXrEj6eYnW3y7LsaBICpyXtw==
liftoff@^2.1.0: liftoff@^2.1.0:
version "2.5.0" version "2.5.0"
resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec" resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec"