cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move Safari hacks to CSS, do not optimize contrast in Chrome

Browse Source
This commit is contained in:
Vladimir Agafonkin 2014-01-27 18:18:04 +02:00
parent 9228b3089f
commit 187d9c2368
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dist/leaflet.css vendored
View File

@ -25,7 +25,16 @@
-moz-user-select: none; -moz-user-select: none;
user-select: none; user-select: none;
-webkit-user-drag: none; -webkit-user-drag: none;
image-rendering:-webkit-optimize-contrast; }
/* 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 {

5
src/core/Browser.js
View File

@ -12,6 +12,7 @@
webkit = ua.indexOf('webkit') !== -1, webkit = ua.indexOf('webkit') !== -1,
phantomjs = ua.indexOf('phantom') !== -1, phantomjs = ua.indexOf('phantom') !== -1,
android23 = ua.search('android [23]') !== -1, android23 = ua.search('android [23]') !== -1,
chrome = ua.indexOf('chrome') !== -1,
mobile = typeof orientation !== 'undefined', mobile = typeof orientation !== 'undefined',
msPointer = navigator.msPointerEnabled && navigator.msMaxTouchPoints && !window.PointerEvent, msPointer = navigator.msPointerEnabled && navigator.msMaxTouchPoints && !window.PointerEvent,
@ -40,8 +41,8 @@
gecko: (ua.indexOf('gecko') !== -1) && !webkit && !window.opera && !ie, gecko: (ua.indexOf('gecko') !== -1) && !webkit && !window.opera && !ie,
android: ua.indexOf('android') !== -1, android: ua.indexOf('android') !== -1,
android23: android23, android23: android23,
chrome: ua.indexOf('chrome') !== -1, chrome: chrome,
safari: ua.indexOf('safari') !== -1, safari: !chrome && ua.indexOf('safari') !== -1,
ie3d: ie3d, ie3d: ie3d,
webkit3d: webkit3d, webkit3d: webkit3d,

5
src/layer/tile/GridLayer.js
View File

@ -200,11 +200,6 @@ L.GridLayer = L.Layer.extend({
front.innerHTML = ''; front.innerHTML = '';
// hack that prevents hw layers "stretching" when loading new tiles // hack that prevents hw layers "stretching" when loading new tiles
if (this._zoomAnimated && L.Browser.safari) {
front.style.width = '1600px';
front.style.height = '1600px';
front.style.WebkitTransformOrigin = '0 0';
}
if (this._zoomAnimated && e && e.hard) { if (this._zoomAnimated && e && e.hard) {
this._clearBgBuffer(); this._clearBgBuffer();

1
src/map/Map.js
View File

@ -435,6 +435,7 @@ L.Map = L.Evented.extend({
(L.Browser.touch ? ' leaflet-touch' : '') + (L.Browser.touch ? ' leaflet-touch' : '') +
(L.Browser.retina ? ' leaflet-retina' : '') + (L.Browser.retina ? ' leaflet-retina' : '') +
(L.Browser.ielt9 ? ' leaflet-oldie' : '') + (L.Browser.ielt9 ? ' leaflet-oldie' : '') +
(L.Browser.safari ? ' leaflet-safari' : '') +
(this._fadeAnimated ? ' leaflet-fade-anim' : '')); (this._fadeAnimated ? ' leaflet-fade-anim' : ''));
var position = L.DomUtil.getStyle(container, 'position'); var position = L.DomUtil.getStyle(container, 'position');