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

2327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vladimir Agafonkin
dea408ad59 Merge pull request #1581 from jfirebaugh/getLayerId 
Permit layer stamping to be overridden
 2013-04-10 09:59:41 -07:00
John Firebaugh
786faddc84 Permit layer stamping to be overridden 2013-04-10 12:28:27 -04:00
Vladimir Agafonkin
4b2495abbf Merge pull request #1579 from AndreyChizh/patch-1 
MapAnimationZoom -> AnimationZoom
 2013-04-09 05:15:42 -07:00
Andrey Chizh
6fc5da68f0 Update deps.js 
In module TouchZoom in deps specified old module name "MapAnimationZoom". Should be "AnimationZoom".
 2013-04-09 13:51:44 +03:00
Vladimir Agafonkin
3231f92c24 Merge pull request #1573 from jfirebaugh/prepublish 
Add prepublish script to package.json
 2013-04-08 13:48:00 -07:00
Vladimir Agafonkin
386bf68386 Merge pull request #1574 from tmcw/map-initialization-exception 
Throw an exception if a map div is not found and test for initialization exceptions
 2013-04-08 13:46:53 -07:00
Vladimir Agafonkin
ce96bd3d43 Merge pull request #1575 from cschwarz/patch-1 
Fixed zoom out on Windows 8 with Firefox
 2013-04-08 13:46:23 -07:00
Christian Schwarz
48bec16f49 Fixed zoom out on Windows 8 with Firefox 
Firefox receives wheel delta of 0.33 on zoom in and -0.33 on zoom out, which turns into Math.ceil(0.33) == 1 and Math.round(-0.33) == 0. After this fix it returns correctly -1 for zooming out.
Worked fine before and after this fix in Chrome and Internet Explorer.
 2013-04-08 23:33:53 +03:00
Tom MacWright
22810aacf7 Throw an exception if a map div is not found 
and test for initialization exceptions
 2013-04-08 12:28:27 -04:00
John Firebaugh
618bb4aa77 Add prepublish script to package.json 
Also, npm scripts are run in an environment with node_module
binaries in the path, so just "jake test" and "jake" are sufficient.

https://npmjs.org/doc/scripts.html
 2013-04-08 11:25:32 -04:00
Vladimir Agafonkin
892ed86fb3 Merge pull request #1572 from jfirebaugh/browserify 
Compatibility with browserify
 2013-04-08 08:02:30 -07:00
John Firebaugh
e6998948b1 Compatibility with browserify 
In a browserify package, `this` will refer to a node-style
exports object, not window. So just reference `window`
directly.
 2013-04-08 10:49:39 -04:00
Vladimir Agafonkin
60a906a239 switch to Node 0.10 for Travis 2013-04-05 12:51:40 +03:00
Vladimir Agafonkin
6009d4ae87 move phantomjs check for touch into Leaflet 
to allow standalone mocha-phantomjs usage on the browser reporter
 2013-04-05 12:32:19 +03:00
Vladimir Agafonkin
bde0692236 always show master branch image for Travis status 2013-04-05 12:08:25 +03:00
John Firebaugh
0e9b7249d8 Convert to expect.js assertions 2013-04-04 09:47:45 -07:00
John Firebaugh
55edd44678 Add #toGeoJSON to various layer types (#712) 2013-04-04 09:46:18 -07:00
Vladimir Agafonkin
6c7316dfec fix coverage reporting in Karma #1479, close karma-runner/karma#461 2013-04-04 12:18:17 +03:00
Vladimir Agafonkin
8b9eb1bea1 Merge pull request #1479 from Leaflet/mocha 
Mocha
 2013-04-04 01:36:36 -07:00
John Firebaugh
81f21125d4 Update specs for mocha 2013-04-03 15:22:45 -07:00
John Firebaugh
a950e6873e Manage mocha dependency with npm; update to 1.9.0 2013-04-03 15:20:15 -07:00
John Firebaugh
a8ca5a2dbf Update mocha.js 2013-04-03 14:50:10 -07:00
Vladimir Agafonkin
80ba8d9054 remove testacular master hack (as 0.6 is now stable) 2013-04-03 14:50:10 -07:00
Tom MacWright
8691889d49 Proper default for delta 2013-04-03 14:50:10 -07:00
Tom MacWright
bf99fdb70e Tighter tolerance for point-near check 2013-04-03 14:50:10 -07:00
Tom MacWright
a3ab4b1095 Fix mercator tests, these are broken in Leaflet master. 2013-04-03 14:50:10 -07:00
Tom MacWright
a2f7d7e834 Use mocha 2013-04-03 14:50:09 -07:00
Vladimir Agafonkin
b84be89095 Merge pull request #1568 from jfirebaugh/karma 
testacular -> karma
 2013-04-03 14:38:15 -07:00
John Firebaugh
28daa9e9b1 testacular -> karma 2013-04-03 14:12:51 -07:00
Vladimir Agafonkin
c0d01ceffe remove testacular master hack (as 0.6 is now stable) 2013-04-03 14:12:13 -07:00
Vladimir Agafonkin
b51239a4b4 Merge pull request #1562 from AndreyChizh/patch-1 
Module AnimationPan is defined as dependent on itself
 2013-04-01 02:11:52 -07:00
Andrey Chizh
eafede40d4 Update deps.js 
The description refers to the module dependency on itself
 2013-04-01 12:01:16 +03:00
Vladimir Agafonkin
c247dfdb2c Merge pull request #1537 from dotCypress/master 
Popup close button fix
 2013-03-28 13:35:11 -07:00
Vladimir Agafonkin
0aed98f7d2 Merge pull request #1554 from olegsmith/master 
Support functions in L.Util.template
 2013-03-28 04:24:40 -07:00
Oleg Smith
ea926000f8 Strage behavior of inplace github editor 2013-03-28 15:23:03 +04:00
olegsmith
683642d7e4 Remove trailing whitespace in fix 2013-03-28 15:01:15 +04:00
Vladimir Agafonkin
28d047da74 update build again 2013-03-28 11:11:46 +02:00
Vladimir Agafonkin
547e9936f2 Merge branch 'master' of https://github.com/Leaflet/Leaflet 
* 'master' of https://github.com/Leaflet/Leaflet:
  fix enable/disable of marker dragging
 2013-03-28 11:11:18 +02:00
Vladimir Agafonkin
28b4854332 update build 2013-03-28 11:10:58 +02:00
Vladimir Agafonkin
08a8c39088 fix moveend not always firing on drag 2013-03-28 11:10:44 +02:00
Vladimir Agafonkin
f1b57f3013 update jake (prev version was having some problems building Leaflet) 2013-03-28 11:10:25 +02:00
olegsmith
d125152c4b Extend L.Util.template 
Look at hash function in Wikimapia      
     L.tileLayer('http://{s}{hash}.wikimapia.org/?x={x}&y={y}&zoom={z}&r=7071412&type=hybrid&lng=1', {
        hash: function (data) {
          return data.x % 4 + (data.y % 4) *4;
        }
        , subdomains : 'i'
        , maxZoom: 18
        , attribution: '<a href="http://wikimapia.org" target="_blank">Wikimapia.org</a>'
      }).addTo(map);

http://olegsmith.github.com/leaflet.wikimapia/
 2013-03-28 11:03:57 +04:00
Vladimir Agafonkin
c12c653eaa Merge pull request #1551 from escaped/master 
fix enable/disable of marker dragging
 2013-03-27 15:27:33 -07:00
Alexander frenzel
d904859ba3 fix enable/disable of marker dragging 2013-03-27 21:03:05 +01:00
Vladimir Agafonkin
3c13569147 update cloudmade API key on all debug pages 2013-03-22 16:27:07 +02:00
Vitaly Domnikov
b1742194f4 Popup close button bugfix 2013-03-20 16:24:47 +02:00
Vladimir Agafonkin
b657f32020 Merge pull request #1532 from malexeev/master 
Somewhat "safer" _getSubdomain method - now it works even when (tilePoint.x + tilePoint.y) is negative.
 2013-03-18 14:26:07 -07:00
malexeev
e110c7bbfe safer _getSubdomain 
Note that (tilePoint.x + tilePoint.y) might be negative in some cases (custom CRS with tiled WMS).
 2013-03-18 22:54:52 +02:00
Vladimir Agafonkin
a1acaffdf1 Merge pull request #1514 from danzel/featuregroup 
Fix adding/removing events on an unstamped context
 2013-03-18 12:48:11 -07:00
danzel
a6a4fe5219 Use L.stamp to always have a stamped context on removal too. 2013-03-19 08:33:26 +13:00