Update to Leaflet 0.7.5
This commit is contained in:
parent
9ceb077afc
commit
e3de1c4572
3 changed files with 37 additions and 72 deletions
|
@ -11,13 +11,13 @@ folder 'vendor/assets' do
|
||||||
end
|
end
|
||||||
|
|
||||||
folder 'leaflet' do
|
folder 'leaflet' do
|
||||||
file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet-0.7.4/leaflet-src.js'
|
file 'leaflet.js', 'http://cdn.leafletjs.com/leaflet-0.7.5/leaflet-src.js'
|
||||||
file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.7.4/leaflet.css'
|
file 'leaflet.css', 'http://cdn.leafletjs.com/leaflet-0.7.5/leaflet.css'
|
||||||
|
|
||||||
[ 'layers.png', 'layers-2x.png',
|
[ 'layers.png', 'layers-2x.png',
|
||||||
'marker-icon.png', 'marker-icon-2x.png',
|
'marker-icon.png', 'marker-icon-2x.png',
|
||||||
'marker-shadow.png' ].each do |image|
|
'marker-shadow.png' ].each do |image|
|
||||||
file "images/#{image}", "http://cdn.leafletjs.com/leaflet-0.7.4/images/#{image}"
|
file "images/#{image}", "http://cdn.leafletjs.com/leaflet-0.7.5/images/#{image}"
|
||||||
end
|
end
|
||||||
|
|
||||||
from 'git://github.com/kajic/leaflet-locationfilter.git' do
|
from 'git://github.com/kajic/leaflet-locationfilter.git' do
|
||||||
|
|
93
vendor/assets/leaflet/leaflet.css
vendored
93
vendor/assets/leaflet/leaflet.css
vendored
|
@ -1,12 +1,16 @@
|
||||||
/* required styles */
|
/* required styles */
|
||||||
|
|
||||||
.leaflet-pane,
|
.leaflet-map-pane,
|
||||||
.leaflet-tile,
|
.leaflet-tile,
|
||||||
.leaflet-marker-icon,
|
.leaflet-marker-icon,
|
||||||
.leaflet-marker-shadow,
|
.leaflet-marker-shadow,
|
||||||
|
.leaflet-tile-pane,
|
||||||
.leaflet-tile-container,
|
.leaflet-tile-container,
|
||||||
.leaflet-map-pane svg,
|
.leaflet-overlay-pane,
|
||||||
.leaflet-map-pane canvas,
|
.leaflet-shadow-pane,
|
||||||
|
.leaflet-marker-pane,
|
||||||
|
.leaflet-popup-pane,
|
||||||
|
.leaflet-overlay-pane svg,
|
||||||
.leaflet-zoom-box,
|
.leaflet-zoom-box,
|
||||||
.leaflet-image-layer,
|
.leaflet-image-layer,
|
||||||
.leaflet-layer {
|
.leaflet-layer {
|
||||||
|
@ -17,7 +21,6 @@
|
||||||
.leaflet-container {
|
.leaflet-container {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
-ms-touch-action: none;
|
-ms-touch-action: none;
|
||||||
touch-action: none;
|
|
||||||
}
|
}
|
||||||
.leaflet-tile,
|
.leaflet-tile,
|
||||||
.leaflet-marker-icon,
|
.leaflet-marker-icon,
|
||||||
|
@ -25,30 +28,20 @@
|
||||||
-webkit-user-select: none;
|
-webkit-user-select: none;
|
||||||
-moz-user-select: none;
|
-moz-user-select: none;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
-webkit-user-drag: none;
|
-webkit-user-drag: none;
|
||||||
}
|
|
||||||
/* Safari renders non-retina tile on retina better with this, but Chrome is worse */
|
|
||||||
.leaflet-safari .leaflet-tile {
|
|
||||||
image-rendering: -webkit-optimize-contrast;
|
|
||||||
}
|
|
||||||
/* hack that prevents hw layers "stretching" when loading new tiles */
|
|
||||||
.leaflet-safari .leaflet-tile-container {
|
|
||||||
width: 1600px;
|
|
||||||
height: 1600px;
|
|
||||||
-webkit-transform-origin: 0 0;
|
|
||||||
}
|
}
|
||||||
.leaflet-marker-icon,
|
.leaflet-marker-icon,
|
||||||
.leaflet-marker-shadow {
|
.leaflet-marker-shadow {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */
|
/* map is broken in FF if you have max-width: 100% on tiles */
|
||||||
/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
|
.leaflet-container img {
|
||||||
.leaflet-container .leaflet-overlay-pane svg,
|
|
||||||
.leaflet-container .leaflet-marker-pane img,
|
|
||||||
.leaflet-container .leaflet-tile-pane img,
|
|
||||||
.leaflet-container img.leaflet-image-layer {
|
|
||||||
max-width: none !important;
|
max-width: none !important;
|
||||||
}
|
}
|
||||||
|
/* stupid Android 2 doesn't understand "max-width: none" properly */
|
||||||
|
.leaflet-container img.leaflet-image-layer {
|
||||||
|
max-width: 15000px !important;
|
||||||
|
}
|
||||||
.leaflet-tile {
|
.leaflet-tile {
|
||||||
filter: inherit;
|
filter: inherit;
|
||||||
visibility: hidden;
|
visibility: hidden;
|
||||||
|
@ -59,25 +52,18 @@
|
||||||
.leaflet-zoom-box {
|
.leaflet-zoom-box {
|
||||||
width: 0;
|
width: 0;
|
||||||
height: 0;
|
height: 0;
|
||||||
-moz-box-sizing: border-box;
|
|
||||||
box-sizing: border-box;
|
|
||||||
z-index: 800;
|
|
||||||
}
|
}
|
||||||
/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
|
/* workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=888319 */
|
||||||
.leaflet-overlay-pane svg {
|
.leaflet-overlay-pane svg {
|
||||||
-moz-user-select: none;
|
-moz-user-select: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.leaflet-pane { z-index: 400; }
|
.leaflet-tile-pane { z-index: 2; }
|
||||||
|
.leaflet-objects-pane { z-index: 3; }
|
||||||
.leaflet-tile-pane { z-index: 200; }
|
.leaflet-overlay-pane { z-index: 4; }
|
||||||
.leaflet-overlay-pane { z-index: 400; }
|
.leaflet-shadow-pane { z-index: 5; }
|
||||||
.leaflet-shadow-pane { z-index: 500; }
|
.leaflet-marker-pane { z-index: 6; }
|
||||||
.leaflet-marker-pane { z-index: 600; }
|
.leaflet-popup-pane { z-index: 7; }
|
||||||
.leaflet-popup-pane { z-index: 700; }
|
|
||||||
|
|
||||||
.leaflet-map-pane canvas { z-index: 100; }
|
|
||||||
.leaflet-map-pane svg { z-index: 200; }
|
|
||||||
|
|
||||||
.leaflet-vml-shape {
|
.leaflet-vml-shape {
|
||||||
width: 1px;
|
width: 1px;
|
||||||
|
@ -94,7 +80,7 @@
|
||||||
|
|
||||||
.leaflet-control {
|
.leaflet-control {
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 800;
|
z-index: 7;
|
||||||
pointer-events: auto;
|
pointer-events: auto;
|
||||||
}
|
}
|
||||||
.leaflet-top,
|
.leaflet-top,
|
||||||
|
@ -138,9 +124,7 @@
|
||||||
|
|
||||||
/* zoom and fade animations */
|
/* zoom and fade animations */
|
||||||
|
|
||||||
.leaflet-fade-anim .leaflet-tile {
|
.leaflet-fade-anim .leaflet-tile,
|
||||||
will-change: opacity;
|
|
||||||
}
|
|
||||||
.leaflet-fade-anim .leaflet-popup {
|
.leaflet-fade-anim .leaflet-popup {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
-webkit-transition: opacity 0.2s linear;
|
-webkit-transition: opacity 0.2s linear;
|
||||||
|
@ -148,17 +132,11 @@
|
||||||
-o-transition: opacity 0.2s linear;
|
-o-transition: opacity 0.2s linear;
|
||||||
transition: opacity 0.2s linear;
|
transition: opacity 0.2s linear;
|
||||||
}
|
}
|
||||||
|
.leaflet-fade-anim .leaflet-tile-loaded,
|
||||||
.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
|
.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
.leaflet-zoom-animated {
|
|
||||||
-webkit-transform-origin: 0 0;
|
|
||||||
-ms-transform-origin: 0 0;
|
|
||||||
transform-origin: 0 0;
|
|
||||||
}
|
|
||||||
.leaflet-zoom-anim .leaflet-zoom-animated {
|
|
||||||
will-change: transform;
|
|
||||||
}
|
|
||||||
.leaflet-zoom-anim .leaflet-zoom-animated {
|
.leaflet-zoom-anim .leaflet-zoom-animated {
|
||||||
-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
|
-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
|
||||||
-moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
|
-moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
|
||||||
|
@ -166,7 +144,8 @@
|
||||||
transition: transform 0.25s cubic-bezier(0,0,0.25,1);
|
transition: transform 0.25s cubic-bezier(0,0,0.25,1);
|
||||||
}
|
}
|
||||||
.leaflet-zoom-anim .leaflet-tile,
|
.leaflet-zoom-anim .leaflet-tile,
|
||||||
.leaflet-pan-anim .leaflet-tile {
|
.leaflet-pan-anim .leaflet-tile,
|
||||||
|
.leaflet-touching .leaflet-zoom-animated {
|
||||||
-webkit-transition: none;
|
-webkit-transition: none;
|
||||||
-moz-transition: none;
|
-moz-transition: none;
|
||||||
-o-transition: none;
|
-o-transition: none;
|
||||||
|
@ -180,24 +159,19 @@
|
||||||
|
|
||||||
/* cursors */
|
/* cursors */
|
||||||
|
|
||||||
.leaflet-interactive {
|
.leaflet-clickable {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
.leaflet-grab {
|
.leaflet-container {
|
||||||
cursor: -webkit-grab;
|
cursor: -webkit-grab;
|
||||||
cursor: -moz-grab;
|
cursor: -moz-grab;
|
||||||
}
|
}
|
||||||
.leaflet-crosshair,
|
|
||||||
.leaflet-crosshair .leaflet-interactive {
|
|
||||||
cursor: crosshair;
|
|
||||||
}
|
|
||||||
.leaflet-popup-pane,
|
.leaflet-popup-pane,
|
||||||
.leaflet-control {
|
.leaflet-control {
|
||||||
cursor: auto;
|
cursor: auto;
|
||||||
}
|
}
|
||||||
.leaflet-dragging .leaflet-grab,
|
.leaflet-dragging .leaflet-container,
|
||||||
.leaflet-dragging .leaflet-grab .leaflet-interactive,
|
.leaflet-dragging .leaflet-clickable {
|
||||||
.leaflet-dragging .leaflet-marker-draggable {
|
|
||||||
cursor: move;
|
cursor: move;
|
||||||
cursor: -webkit-grabbing;
|
cursor: -webkit-grabbing;
|
||||||
cursor: -moz-grabbing;
|
cursor: -moz-grabbing;
|
||||||
|
@ -329,10 +303,6 @@
|
||||||
color: #333;
|
color: #333;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
}
|
}
|
||||||
.leaflet-control-layers-scrollbar {
|
|
||||||
overflow-y: scroll;
|
|
||||||
padding-right: 5px;
|
|
||||||
}
|
|
||||||
.leaflet-control-layers-selector {
|
.leaflet-control-layers-selector {
|
||||||
margin-top: 2px;
|
margin-top: 2px;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
@ -452,7 +422,7 @@
|
||||||
.leaflet-popup-content-wrapper,
|
.leaflet-popup-content-wrapper,
|
||||||
.leaflet-popup-tip {
|
.leaflet-popup-tip {
|
||||||
background: white;
|
background: white;
|
||||||
color: #333;
|
|
||||||
box-shadow: 0 3px 14px rgba(0,0,0,0.4);
|
box-shadow: 0 3px 14px rgba(0,0,0,0.4);
|
||||||
}
|
}
|
||||||
.leaflet-container a.leaflet-popup-close-button {
|
.leaflet-container a.leaflet-popup-close-button {
|
||||||
|
@ -460,7 +430,6 @@
|
||||||
top: 0;
|
top: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
padding: 4px 4px 0 0;
|
padding: 4px 4px 0 0;
|
||||||
border: none;
|
|
||||||
text-align: center;
|
text-align: center;
|
||||||
width: 18px;
|
width: 18px;
|
||||||
height: 14px;
|
height: 14px;
|
||||||
|
|
10
vendor/assets/leaflet/leaflet.js
vendored
10
vendor/assets/leaflet/leaflet.js
vendored
|
@ -7,7 +7,7 @@
|
||||||
var oldL = window.L,
|
var oldL = window.L,
|
||||||
L = {};
|
L = {};
|
||||||
|
|
||||||
L.version = '0.7.4';
|
L.version = '0.7.5';
|
||||||
|
|
||||||
// define Leaflet for Node module pattern loaders, including Browserify
|
// define Leaflet for Node module pattern loaders, including Browserify
|
||||||
if (typeof module === 'object' && typeof module.exports === 'object') {
|
if (typeof module === 'object' && typeof module.exports === 'object') {
|
||||||
|
@ -3537,12 +3537,8 @@ L.Marker = L.Class.extend({
|
||||||
|
|
||||||
update: function () {
|
update: function () {
|
||||||
if (this._icon) {
|
if (this._icon) {
|
||||||
var pos = this._map.latLngToLayerPoint(this._latlng).round();
|
this._setPos(this._map.latLngToLayerPoint(this._latlng).round());
|
||||||
L.Util.requestAnimFrame(function () {
|
|
||||||
this._setPos(pos);
|
|
||||||
}, this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -3565,7 +3561,7 @@ L.Marker = L.Class.extend({
|
||||||
if (options.title) {
|
if (options.title) {
|
||||||
icon.title = options.title;
|
icon.title = options.title;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options.alt) {
|
if (options.alt) {
|
||||||
icon.alt = options.alt;
|
icon.alt = options.alt;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue