cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,091 Commits 13 Branches 25 Tags 44 MiB
34075a893a
Commit Graph

4091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jan Pieter Waagmeester
34075a893a Unit tests for TileLayer getTileUrl replacements 2016-03-21 15:00:13 +01:00
Jan Pieter Waagmeester
37254587be Allow dashes in template placeholders + tests 2016-03-21 14:36:21 +01:00
Iván Sánchez Ortega
b60e18d5c6 Merge pull request #4337 from jieter/tilelayer-y 
Support {-y} in tile layer urls (Fixes #4284)
 2016-03-21 12:36:10 +01:00
Jan Pieter Waagmeester
d5e78e2253 Support {-y} in tile layer urls (Fixes #4284) 2016-03-21 11:51:24 +01:00
Vladimir Agafonkin
8e2e790933 Merge pull request #4327 from Leaflet/prosthetic-hand-tests 
prosthetic-hand unit tests
 2016-03-18 16:37:38 +02:00
Iván Sánchez Ortega
8da61993d2 Added four prosthetic-hand tests, checking mouse&touch drag events and touch-zoom 2016-03-18 15:24:42 +01:00
Iván Sánchez Ortega
0ea9832771 Merge pull request #4324 from OpenDevTeam3/drag-undefineds 
fixing this._times.length undefined in Map.Drag.js, fixes #4311
 2016-03-15 16:26:46 +01:00
mouradeolive
5f7c2e07d6 fixing this._times.length undefined in Map.Drag.js 
Update Map.Drag.js

Update Map.Drag.js
 2016-03-15 15:47:37 +01:00
Vladimir Agafonkin
d773d6a6da Merge pull request #4308 from Leaflet/canvas-dasharray 
Port #4173 to master: dashArray in Canvas
 2016-03-14 15:22:50 +02:00
Iván Sánchez Ortega
8aa32484b4 Port #4173 to master 2016-03-08 16:58:36 +01:00
Vladimir Agafonkin
98e87d3d94 Revert "Stop drag propagation, fixes #4249" 
This reverts commit a32017f890.
 2016-03-07 23:12:39 +02:00
Vladimir Agafonkin
4333f8831d Merge pull request #4306 from MasterMaps/stop-drag-propagation 
Stop drag propagation, fixes #4249
 2016-03-07 14:26:43 +02:00
Bjorn Sandvik
a32017f890 Stop drag propagation, fixes #4249 2016-03-07 12:53:50 +01:00
Vladimir Agafonkin
7ebbd19737 Merge pull request #4293 from dr-itz/4285-attribution-text 
Fix attribution text not removed when Layer is removed from map
 2016-03-02 16:00:03 +02:00
Daniel Ritz
0af11b064e Fix attribution text not removed when Layer is removed from map 
Symptom: Switching between layers with different attributions does
not remove the attribution from the previously selected layer.

Control.Attribution keeps track of its attributions with a counter for
each text. The problem described in #4285 is that each time the layer
is added to the map, the counter is increased by two. It's because
Layer calls Control.Attribution.addAttribution() twice, once from
addLayer() and the second time via the whenReady() callback _layerAdd().
This was not caught by the tests since the callback was never fired
(missing map.setView() call).

Fixes #4285
 2016-03-01 13:46:40 +01:00
Vladimir Agafonkin
f7d7ad22b3 Merge pull request #4280 from errebenito/master 
Skip call to this._update() if this._map is null
 2016-03-01 11:26:57 +02:00
Vladimir Agafonkin
ac6b18d7a2 Merge pull request #4290 from JrFolk/0.7-legacy-support 
Increase depth of legacy support
 2016-03-01 11:21:58 +02:00
Vladimir Agafonkin
33da55d307 Merge pull request #4289 from Leaflet/phantomjs2 
Update phantomjs dependency version
 2016-03-01 11:20:42 +02:00
Vladimir Agafonkin
2b970bf1ce Merge pull request #4287 from Leaflet/pointer-enabled 
Clean up navigator.pointerEnabled
 2016-03-01 11:20:05 +02:00
Joseph Folkemer
97921d6cef Increase depth of legacy support 
A lot of plugins use the capitalized internal constructors rather than
the API.  This should broaden legacy support for plugins that use the
L.Circle constructor.
 2016-02-29 13:01:30 -06:00
Iván Sánchez Ortega
3c38ae3ef0 Update phantomjs dependency version 2016-02-29 17:05:13 +01:00
Iván Sánchez Ortega
a1371507bf Clean up navigator.pointerEnabled 2016-02-29 16:19:34 +01:00
Raúl Benito
11e289ba7d Skip call to this._update() if this._map is null 
Returns this instead of this._update() if this._map is not set on addBaseLayer(), addOverlay() and removeLayer().
 2016-02-26 20:57:53 +01:00
Iván Sánchez Ortega
663978227d Unit tests for #4257, attributionControl layeradd/layerremove 2016-02-18 21:31:00 +01:00
Iván Sánchez Ortega
e0c17bffee Merge pull request #4263 from snkashis/layer_attr_fix 
centralize setting of attributionControl on map from onAdd
 2016-02-18 18:40:49 +01:00
Steve Kashishian
fb79bbf9dd centralize setting of attributionControl on map from onAdd 2016-02-18 11:24:44 -05:00
Vladimir Agafonkin
093d77217e Merge pull request #4256 from Leaflet/filterclick-originalevent 
Check for e.originalEvent in DomUtil._filterclick
 2016-02-17 18:54:00 +02:00
Iván Sánchez Ortega
8290a4179c Check for e.originalEvent in DomUtil._filterclick, should fix #3724 2016-02-17 17:08:00 +01:00
Vladimir Agafonkin
2dd8b8a3b4 Merge pull request #4244 from hyperknot/fix-tileprune-map-bug 
check _map in _pruneTiles
 2016-02-16 15:18:31 +02:00
Vladimir Agafonkin
c83e8eb8a2 Merge pull request #4246 from Leaflet/class-returns 
L.Class.include & mergeOptions now return 'this'
 2016-02-16 15:17:00 +02:00
Iván Sánchez Ortega
ccd95e38e6 L.Class.include & mergeOptions now return 'this' 2016-02-15 16:38:35 +01:00
Iván Sánchez Ortega
54f0f734ba Merge pull request #4206 from hyperknot/tile-debug 
Tile debug
 2016-02-15 15:17:01 +01:00
Zsolt Ero
d891310b72 check _map in _pruneTiles 2016-02-15 14:49:24 +01:00
Yohan Boniface
2d202aa7df Merge pull request #4241 from k-nut/radius-nan-test 
Add test for throwing error if circle radius is NaN
 2016-02-15 12:00:51 +01:00
Knut Hühne
df19ec7c30 Add test for throwing error if circle radius is NaN 2016-02-15 11:51:27 +01:00
Yohan Boniface
0480e3c5f3 Merge pull request #4236 from Leaflet/radius-nan 
Throw error on NaN circle radius
 2016-02-15 11:19:42 +01:00
Yohan Boniface
50539d6fe5 Merge pull request #4131 from Leaflet/chrome-win10-dblclick 
Possible fix for #4127, assume dblclick DOM event exists in touch-capable browsers
 2016-02-15 11:18:42 +01:00
Iván Sánchez Ortega
2730a3e3cf Throw error on NaN circle radius, #4235 2016-02-15 10:20:36 +01:00
Iván Sánchez Ortega
5ea4f9a71e Merge pull request #4224 from hyperknot/fix-scroll-zoom-calculation 
fix fractional zoom calculation
 2016-02-12 13:21:15 +01:00
Zsolt Ero
7dd71b83f4 workaround flyTo bug 2016-02-12 03:14:12 +01:00
Zsolt Ero
3c87804f42 added gridLoadData 2016-02-12 02:12:05 +01:00
Zsolt Ero
3517a62729 fix fractional scroll zoom calculation 2016-02-12 00:48:49 +01:00
Per Liedman
0a93dc6d84 Merge pull request #4214 from Leaflet/control-layers-cleanup 
Better cleanup of L.Control.Layers, fixes #4213 (plus unit tests)
 2016-02-09 22:12:16 +01:00
Iván Sánchez Ortega
ae91ffd248 Merge pull request #4212 from Leaflet/non3d-updatetransform 
Branch L.Renderer.updateTransform when not L.Browser.any3d, fixes #4211
 2016-02-09 20:13:55 +01:00
Iván Sánchez Ortega
63970e9b6c Better cleanup of L.Control.Layers, fixes #4213 (plus unit tests) 2016-02-09 15:43:03 +01:00
Vladimir Agafonkin
6ee6b98003 Merge pull request #4209 from Leaflet/getzoom-nan 
Fix for #4208 with extra unit tests
 2016-02-09 12:23:52 +02:00
Iván Sánchez Ortega
c40aba27bc Branch L.Renderer.updateTransform when not L.Browser.any3d, fixes #4211 2016-02-09 11:05:18 +01:00
Iván Sánchez Ortega
8dee2d3591 Fix for #4208 with extra unit tests 2016-02-09 10:07:36 +01:00
Zsolt Ero
68d52deada styling fixes 2016-02-09 00:00:04 +01:00
Zsolt Ero
a5506e9f8e added resetCounter, indenting for tile-debug 2016-02-08 23:22:59 +01:00