From 56448b50d06159e9ffaab70e962403a7753eb0bc Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 18 Jan 2018 17:32:33 +0000 Subject: [PATCH 1/1] Update leaflet to 1.3.1 --- Vendorfile | 6 +++--- vendor/assets/leaflet/leaflet.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Vendorfile b/Vendorfile index e64e74e44..e57ab21fe 100644 --- a/Vendorfile +++ b/Vendorfile @@ -11,13 +11,13 @@ folder 'vendor/assets' do end folder 'leaflet' do - file 'leaflet.js', 'https://unpkg.com/leaflet@1.3.0/dist/leaflet-src.js' - file 'leaflet.css', 'https://unpkg.com/leaflet@1.3.0/dist/leaflet.css' + file 'leaflet.js', 'https://unpkg.com/leaflet@1.3.1/dist/leaflet-src.js' + file 'leaflet.css', 'https://unpkg.com/leaflet@1.3.1/dist/leaflet.css' [ 'layers.png', 'layers-2x.png', 'marker-icon.png', 'marker-icon-2x.png', 'marker-shadow.png' ].each do |image| - file "images/#{image}", "https://unpkg.com/leaflet@1.3.0/dist/images/#{image}" + file "images/#{image}", "https://unpkg.com/leaflet@1.3.1/dist/images/#{image}" end from 'git://github.com/aratcliffe/Leaflet.contextmenu.git', :tag => 'v1.5.0' do diff --git a/vendor/assets/leaflet/leaflet.js b/vendor/assets/leaflet/leaflet.js index fff1e831c..63f6fb790 100644 --- a/vendor/assets/leaflet/leaflet.js +++ b/vendor/assets/leaflet/leaflet.js @@ -1,5 +1,5 @@ /* @preserve - * Leaflet 1.3.0, a JS library for interactive maps. http://leafletjs.com + * Leaflet 1.3.1, a JS library for interactive maps. http://leafletjs.com * (c) 2010-2017 Vladimir Agafonkin, (c) 2010-2011 CloudMade */ @@ -9,7 +9,7 @@ (factory((global.L = {}))); }(this, (function (exports) { 'use strict'; -var version = "1.3.0"; +var version = "1.3.1"; /* * @namespace Util @@ -11498,7 +11498,7 @@ var TileLayer = GridLayer.extend({ s: this._getSubdomain(coords), x: coords.x, y: coords.y, - z: coords.z ? coords.z : this._getZoomForUrl() + z: this._getZoomForUrl() }; if (this._map && !this._map.options.crs.infinite) { var invertedY = this._globalTileRange.max.y - coords.y; -- 2.39.5