cartodb/Leaflet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,442 Commits 13 Branches 25 Tags 44 MiB
d08bdc8e78
Commit Graph

3442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Firebaugh
d08bdc8e78 Calculate _tilesToLoad 
Avoids cached _tilesToLoad value getting out of sync with
actual loading tiles, e.g. if _removeOtherTiles or _abortLoading
removes tiles that are loading.
 2015-01-12 17:40:28 -08:00
John Firebaugh
99a21117a0 Merge _tiles, _loaded, and _retain into a single map 2015-01-12 17:40:28 -08:00
John Firebaugh
c8fca59b51 Move _pruneTiles up to _update 
_update is the only place _addTiles is called from,
makes more sense to call _add then _prune than for
_add to call _prune itself.
 2015-01-12 13:03:51 -08:00
John Firebaugh
2ee1aa2c23 jshint 2015-01-12 11:03:42 -08:00
Vladimir Agafonkin
a06ea76d1a Merge pull request #3115 from snkashis/popup_text_color 
provide a default popup text color of #333
 2015-01-07 01:40:02 +02:00
Steve Kashishian
1d174cd502 provide a default popup text color of #333 2015-01-06 16:34:35 -06:00
Vladimir Agafonkin
2e3d4ae020 Merge pull request #3113 from batphil/patch-1 
Happy new year :o)
 2015-01-02 14:17:42 +02:00
batphil
b7dbdade9e Happy new year :o) 2015-01-02 01:23:44 +01:00
Vladimir Agafonkin
dfbd0fa309 Merge pull request #3106 from sam-at-github/patch-1 
Update CONTRIBUTING.md
 2014-12-29 13:13:12 +02:00
sam-at-github
5dc36142f7 Update CONTRIBUTING.md 
Add link to Jakejs.com and slightly more verbose description of build set up. Useful to Node newbs like myself.
 2014-12-28 12:39:18 +11:00
Vladimir Agafonkin
f02767308d Merge pull request #3093 from cebence/no-single-base-layer-in-layers-control 
Hide single base layer in the Layers control
 2014-12-18 16:42:23 +02:00
cebence
bea51fdf4f Disabled by default so it doesn't break existing apps. 2014-12-18 14:28:51 +01:00
cebence
5066ecf043 Hide single base layers in the Layers control. 2014-12-18 13:20:09 +01:00
Vladimir Agafonkin
6e37720f3e Merge pull request #3091 from markjszy/docupdates 
Revisions to CONTRIBUTING.md
 2014-12-18 13:54:20 +02:00
Mark Szymanski
1b8f4aa88d Revisions to CONTRIBUTING.md 2014-12-17 20:03:58 -06:00
Vladimir Agafonkin
2e04b302d0 try out the new fast Travis build thingy 2014-12-17 21:09:10 +02:00
Vladimir Agafonkin
72feb7005d Merge pull request #3084 from miroslavraska/patch-1 
Properly unsubscribe Layer events
 2014-12-08 15:56:22 -05:00
Miroslav Raska
44a56b3a79 Properly unsubscribe Layer events 
I've just bumped into this while browsing the source code. It's not tested in any way and I didn't look for similar issues in other files neither. But I hope it helps anyway.
 2014-12-08 21:30:44 +01:00
Vladimir Agafonkin
6ae848b7ef Merge pull request #3080 from lonelyelk/latlng-no-error 
L.latLng factory not to throw error on empty array parameter
 2014-12-06 10:54:24 -05:00
Sergey Kruk
65cc3c813b Refactoring: L.latLng factory to call constructor with explicit arguments number 2014-12-06 15:32:22 +03:00
Sergey Kruk
c8e5d7c61b L.latLng factory not to throw error on empty array parameter 2014-12-05 20:36:35 +03:00
Vladimir Agafonkin
7cafaa6346 Merge pull request #3070 from lonelyelk/latlng-factory-altitude 
Factory L.latLng to accept altitude
 2014-12-01 08:20:28 -05:00
Sergey Kruk
c5ebd534b2 Factory L.latLng to accept altitude as third parameter or an object's 'alt' property 2014-12-01 16:02:43 +03:00
Vladimir Agafonkin
1ec89d2fdc Merge pull request #3043 from kerryarts/ie8-zindex-fix 
Default zIndex to be a valid value to fix exception in ie8
 2014-11-24 15:48:42 +02:00
Vladimir Agafonkin
69e0d0233d Merge pull request #3052 from kshepard/fix-async-initialize 
Initialize _sizeChanged to true to prevent async map initialization issues
 2014-11-22 11:47:07 +02:00
Kenny Shepard
86a3e0cc8c Initialize _sizeChanged to prevent async issues 
When asynchronously initializing a map, the series of events can
create a scenario where _size is incorrectly initialized, and
therefore calls to getSize will not cause a new value to be generated.

This fix sets _sizeChanged to true upon map initialization, which
allows the following first call to getSize to work properly.

Closes #3031
 2014-11-21 17:54:46 -05:00
Vladimir Agafonkin
76440b9df2 Merge pull request #3050 from kdeloach/topic/disable-zoom-scrolling 
Remove global variable that disables dragging for all maps during zoom
 2014-11-21 21:52:42 +02:00
kdeloach
c97c48325a Remove global variable that disables dragging for all maps during zoom 
Starting a zoom animation will disable dragging for all maps on the
page. Only the map that is being zoomed should have dragging disabled.

This fix removes a global static variable which is redundant since
the map pane already has a css class assigned to it for the duration of
the zoom animation.

Fixes #2539
 2014-11-21 14:41:00 -05:00
Vladimir Agafonkin
e5ee31d6b5 Merge pull request #3048 from CloudNiner/feature/fix-2318 
Closes #2318: getMaxZoom returns prev layer on baselayerchange
 2014-11-21 21:01:21 +02:00
CloudNiner
703f9a47d9 Closes #2318: getMaxZoom returns prev layer on baselayerchange 
Remove all old layers before adding new ones to avoid
the old properties being returned in the baselayerchange handler.
 2014-11-21 13:49:10 -05:00
kerryarts
ff10d00297 Check for null before setting the zindex, and instead keep it null initially. This way calls to setZIndex() wont fail if passed null. 2014-11-21 17:11:10 +13:00
Vladimir Agafonkin
9128193e5b Merge pull request #3044 from kerryarts/vml-bringtofront-fix 
Fix _bringToFront/Back implementation for VML renderer
 2014-11-21 01:16:47 +02:00
kerryarts
0daf28fb4f Fix _bringToFront/Back implementation for VML renderer 2014-11-21 09:41:02 +13:00
kerryarts
756888cee7 default zIndex to be a valid value to fix exception in ie8 2014-11-20 17:11:02 +13:00
Vladimir Agafonkin
2bd788a7da Merge pull request #3038 from flemenach/worldcopy-inertia 
Fix inertia animation with worldCopyJump enabled
 2014-11-18 16:47:41 +02:00
flemenach
8c606358cc Fix inertia animation with worldCopyJump enabled 2014-11-18 09:32:46 +01:00
John Firebaugh
e0a75093dc Merge pull request #3028 from tomhughes/jshint 
Don't require jshint as it is not used
 2014-11-17 13:54:31 -08:00
Tom Hughes
8f5fe4defc Don't require jshint as it is not used 2014-11-15 14:43:57 +00:00
Vladimir Agafonkin
3318f8d424 Merge pull request #3024 from yohanboniface/shift-zoom 
Implement fast zoom on minus/plus keydown with shiftKey
 2014-11-14 18:17:51 +02:00
Yohan Boniface
f41f37c9c0 More compact code 2014-11-14 17:12:15 +01:00
Yohan Boniface
86de51ed9e We don't need an option for the zoom factor 2014-11-14 14:16:41 +01:00
Yohan Boniface
44a10690a7 Implement fast zoom on minus/plus keydown with shiftKey 2014-11-14 12:38:09 +01:00
John Firebaugh
87c7d1d563 No-op Control#remove if not on a map (fixes #2877) 2014-11-13 11:25:49 -08:00
Vladimir Agafonkin
37c5433e5b Merge pull request #3022 from Leaflet/3020 
Remove control from existing map in onAdd (fixes #3020)
 2014-11-13 20:57:55 +02:00
John Firebaugh
0b86fa3266 Remove control from existing map in onAdd (fixes #3020) 2014-11-13 10:49:43 -08:00
John Firebaugh
ef96884021 Ensure parent init hooks are called (fixes #2545) 2014-11-12 14:49:46 -08:00
Vladimir Agafonkin
b27f62387b Merge pull request #3018 from Leaflet/autoclose 
Add autoClose option to Popup
 2014-11-12 23:08:15 +02:00
John Firebaugh
bad49e7612 Add autoClose option to Popup 
Fixes #2716
Fixes #1853
 2014-11-12 12:52:50 -08:00
John Firebaugh
ad12e33dd9 Fix trailing whitespace 2014-11-12 11:30:43 -08:00
John Firebaugh
d2871e68e5 Add test for #3008 2014-11-12 10:53:26 -08:00