Commit Graph

1912 Commits

Author SHA1 Message Date
Vagrant
88ba9dd0c8 Merge branch 'master' of git://github.com/Leaflet/Leaflet
* 'master' of git://github.com/Leaflet/Leaflet:
  Escape URI component in getParamString
  update build and changelog
  hasLayer not checking for null Return false when checking for a null object in L.Map.hasLayer, in response to issue #1282.
  Fix js typo
  Add hasLayer to LayerGroup Add the method hasLayer to LayerGroup, return false when not present or checking for a null layer.
  condition on one line
  Revert "whitespace fix?"
  whitespace fix?
  whitespace again
  Trying to fix whitespace
  Simplify features check
  Handle arrays of feature collections
2013-01-30 10:56:22 -02:00
Vladimir Agafonkin
39f9e2be10 Merge pull request #1317 from yohanboniface/escape_uri_component
Escape URI component in getParamString
2013-01-27 12:37:32 -08:00
Yohan Boniface
c432c4eb24 Escape URI component in getParamString 2013-01-26 17:47:28 +01:00
Vladimir Agafonkin
4551633b9c update build and changelog 2013-01-23 15:45:45 +02:00
Vladimir Agafonkin
140cace2a7 Merge pull request #1300 from rvlasveld/add_hasLayer_to_layerGroup
Add has layer to layer group
2013-01-21 14:29:07 -08:00
Vladimir Agafonkin
7bff6c5f2c Merge pull request #1302 from rvlasveld/fix_hasLayer_check_for_null
hasLayer not checking for null
2013-01-21 14:28:30 -08:00
Roemer Vlasveld
109fd06ae6 hasLayer not checking for null
Return false when checking for a null object in L.Map.hasLayer, in
response to issue #1282.
2013-01-21 23:22:01 +01:00
Roemer Vlasveld
75fa5b087f Fix js typo 2013-01-21 22:46:18 +01:00
Roemer Vlasveld
82d4535180 Add hasLayer to LayerGroup
Add the method hasLayer to LayerGroup, return false when not present or checking for a null layer.
2013-01-21 22:36:24 +01:00
Vladimir Agafonkin
a000304473 Merge pull request #1299 from snkashis/fix_feat_collects
Handle arrays of feature collections, #1298
2013-01-21 07:17:26 -08:00
snkashis
5524db2816 condition on one line 2013-01-21 10:14:42 -05:00
snkashis
65aad99297 Revert "whitespace fix?"
This reverts commit 9856a66864.
2013-01-20 20:18:48 -05:00
Steve
9856a66864 whitespace fix? 2013-01-20 20:06:52 -05:00
Steve
c0210009df whitespace again 2013-01-20 19:39:01 -05:00
Steve
03a775c69b Trying to fix whitespace 2013-01-20 19:38:12 -05:00
Steve
52b445a36d Simplify features check 2013-01-20 19:35:18 -05:00
snkashis
c43e72da16 Handle arrays of feature collections 2013-01-20 19:13:43 -05:00
Eldar Djafarov
e1a3e97349 testacular port 2013-01-20 05:04:06 -02:00
Vladimir Agafonkin
4056f4c504 Merge pull request #1294 from calvinmetcalf/IconPath
Wrong default icon path on old IE in certain cases.
2013-01-18 10:49:28 -08:00
Calvin Metcalf
f26da9f9be only mention the path, and ternery 2013-01-18 13:35:07 -05:00
Calvin Metcalf
c3cb132463 we want it reletive not from the base 2013-01-18 12:46:16 -05:00
Calvin Metcalf
82869206e2 ie7 fix 2013-01-18 12:41:11 -05:00
Vladimir Agafonkin
80413f4040 update build 2013-01-18 17:44:11 +02:00
Vladimir Agafonkin
353d03586a update changelog 2013-01-18 17:43:56 +02:00
Vladimir Agafonkin
292d2b3633 merge snkashis polygon fix 2013-01-18 17:43:31 +02:00
Vladimir Agafonkin
10bd63a6a6 update changelog, bump version 2013-01-18 17:30:53 +02:00
Vladimir Agafonkin
76f8d0762d Merge pull request #1287 from jieter/master
TileLayer.Canvas now returns this.
2013-01-18 07:25:37 -08:00
Vladimir Agafonkin
5fccd34a54 Merge pull request #1286 from calvinmetcalf/layerControlEvents
Layer control events for overlays
2013-01-18 07:25:22 -08:00
Vladimir Agafonkin
2fb4d673a1 Merge pull request #1290 from yohanboniface/docstring_typo
Typo in Polyline docstring
2013-01-18 05:24:18 -08:00
Yohan Boniface
44a7c6e0d8 Typo in Polyline docstring 2013-01-18 12:48:43 +01:00
Vladimir Agafonkin
b2d2422337 update changelog 2013-01-17 18:32:05 +02:00
Vladimir Agafonkin
eed2c8a12b fix FF minus key, close #869, update changelog and build 2013-01-17 11:51:52 +02:00
Jan Pieter Waagmeester
12d04f5c59 TileLayer.Canvas.redraw() now returns this. 2013-01-17 09:39:06 +01:00
Calvin Metcalf
c0e4241f36 rename events 2013-01-16 22:00:55 -05:00
Calvin Metcalf
88f1e121ee overlay events 2013-01-16 18:20:20 -05:00
Vladimir Agafonkin
8facf33896 fix whitespace, update build 2013-01-16 17:08:57 +02:00
Vladimir Agafonkin
e3528c2d22 update zoom control styles, extract general toolbar classes, fix #1209 2013-01-16 17:08:06 +02:00
Vladimir Agafonkin
11e74ccab9 minor cleanup 2013-01-15 16:19:04 +02:00
Vladimir Agafonkin
e49fe66738 update changelog more 2013-01-15 16:18:57 +02:00
Vladimir Agafonkin
51820f5d48 fix changelog 2013-01-15 12:39:43 +02:00
Vladimir Agafonkin
10f07c18ef update changelog 2013-01-15 12:37:56 +02:00
Vladimir Agafonkin
c27e26273a update changelog 2013-01-15 12:32:46 +02:00
Vladimir Agafonkin
85dffbd9eb update build 2013-01-15 12:16:15 +02:00
Vladimir Agafonkin
405bf0c05d Merge pull request #1279 from oslek/isArray
Robust array type check for cross-frame support
2013-01-14 15:11:41 -08:00
oslek
7dd7e4f699 Robust array type check for cross-frame support
In a multi-frame DOM environment, if setView is called with an array for
the first parameter, a subsequent call to getBounds raises "Invalid
LatLng object" exception. This is the case if the array passed to
setView was created outside the iFrame that contains the map. It causes
the array test using "instanceof" in L.latLng to fail, and
_initialTopLeftPoint to not being properly initialized.

Thank you to Juriy Zaytsev for the full explaination:
http://perfectionkills.com/instanceof-considered-harmful-or-how-to-write-a-robust-isarray/
John Resig and Dean Edwards post comments and concur.
2013-01-14 14:04:50 -08:00
Dave Leaver
a598e2bc75 Merge pull request #1278 from danzel/master
Fix jshint unhappiness (Thanks @Guiswa)
2013-01-14 13:53:01 -08:00
danzel
365a5b3b02 Fix jshint unhappiness (Thanks @Guiswa) 2013-01-15 10:51:36 +13:00
Vladimir Agafonkin
dad3996d0e Merge pull request #1097 from calvinmetcalf/GeometryCollection
GeoJSON GeometryCollection passes consisent params to pointToLayer
2013-01-14 06:33:28 -08:00
Calvin Metcalf
0ebbd7553e fixed the whitespace and also removed the quotes in object keys 2013-01-14 07:25:34 -05:00
Vladimir Agafonkin
3f4e890b58 Merge pull request #1174 from danzel/master
Add retina marker icon support and retina-ize the default icon
2013-01-14 02:50:28 -08:00