Master upstream

.github/workflows/npmpublish.yml

@@ -0,0 +1,45 @@
+name: Node.js Package
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - run: npm ci
+      - run: npm test
+
+  publish-npm:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+          registry-url: https://registry.npmjs.org/
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.npm_token}}
+
+  publish-gpr:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+          registry-url: https://npm.pkg.github.com/
+          scope: '@your-github-username'
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

CHANGELOG.md

@@ -410,7 +410,6 @@ Animation code in Leaflet had undergone a major rewrite (main PR: [#2382](https:
 
 Note tha we skipped 0.7.6 version for which we accidentally published a broken build to NPM.
 
-
 ## 0.7.5 (September 2, 2015)
 
 * Fixed a regression that broke animation in Leaflet.markercluster. [#3796](https://github.com/Leaflet/Leaflet/issues/3796)
@@ -422,7 +421,7 @@ Note tha we skipped 0.7.6 version for which we accidentally published a broken b
 * Fixed a bug where tile layers were not respecting their `minZoom` or `maxZoom` options (by [@ivansanchez](https://github.com/ivansanchez)) [#3778](https://github.com/Leaflet/Leaflet/pull/3778)
 * Improved detection of touch-capable web browsers, in particular fixing touch interactions in device emulation mode in Chrome and Firefox (by [@ivansanchez](https://github.com/ivansanchez)) [#3520](https://github.com/Leaflet/Leaflet/pull/3520) [#3710](https://github.com/Leaflet/Leaflet/pull/3710)
 * Fixed a bug where tile layers with `maxNativeZoom` were not checking bounds properly (by [@jlaxon](https://github.com/jlaxon)) [#3415](https://github.com/Leaflet/Leaflet/pull/3152)
-* Fixed a bug where popups were not remembering which layer originated them after calling `bindPopup(popup)` (by [@Eschon](https://github.com/Eschon)) [#3675](https://github.com/Leaflet/Leaflet/pull/3675)
+* Fixed a bug where popups were not remembering which layer originated them after calling `bindPopup(popup)` (by [@Eschon](https://github.com/Eschon)) [#3675](https://github.com/Leaflet/Leaflet/pull/3765)
 * Fixed a race condition between markers and zoom animation (by [@perliedman](https://github.com/perliedman)) [#3152](https://github.com/Leaflet/Leaflet/pull/3152)
 * Fixed a bug with `Map.fitBounds` padding (by [@bsstoner](https://github.com/bsstoner)). [#2489](https://github.com/Leaflet/Leaflet/issues/2489)
 * Allow canvas paths to fire `dblclick` and `contextmenu` events (by [@ivansanchez](https://github.com/ivansanchez)) [#3482](https://github.com/Leaflet/Leaflet/pull/3482)
@@ -436,15 +435,14 @@ Note tha we skipped 0.7.6 version for which we accidentally published a broken b
 * Added proper **bower** and **component** support (by [@calvinmetcalf](https://github.com/calvinmetcalf)). [#2561](https://github.com/Leaflet/Leaflet/pull/2561) [#1903](https://github.com/Leaflet/Leaflet/issues/1903)
 * Fixed a bug where dragging the map outside the window caused an error on FF. [#2610](https://github.com/Leaflet/Leaflet/issues/2610)
 * Fixed a bug where some taps on Android where not working, often falsely perceived as drags (by [@axefrog](https://github.com/axefrog)). [#2503](https://github.com/Leaflet/Leaflet/pull/2503)
-* Fixed a bug where clicks on Android were skipped when happened too fast. [#2303](https://github.com/Leaflet/Leaflet/issues/2303)
+* Fixed a bug where tapping too quickly on Android ignored most taps. [#2303](https://github.com/Leaflet/Leaflet/issues/2303)
 * Fixed a bug where calling `setView` (or similar methods) several times in succession could freeze the map. [#2521](https://github.com/Leaflet/Leaflet/issues/2521) [#2236](https://github.com/Leaflet/Leaflet/issues/2236) [#2485](https://github.com/Leaflet/Leaflet/issues/2485)
 * Fixed a bug where `Control.Layers` wasn't properly removed (by [@jack-kerouac](https://github.com/jack-kerouac)). [#2569](https://github.com/Leaflet/Leaflet/pull/2569)
 * Fixed a bug that caused `TileLayer` `load` event not to fire properly. [#2510](https://github.com/Leaflet/Leaflet/issues/2510)
 * Fixed Canvas-based paths not triggering `remove` event when removed (by @adimitrov). [#2486](https://github.com/Leaflet/Leaflet/pull/2486)
 * Fixed a bug where you could end up with fractional zoom after pinch-zooming in some cases (by [@danzel](https://github.com/danzel). [#2400](https://github.com/Leaflet/Leaflet/pull/2400) [#1943](https://github.com/Leaflet/Leaflet/issues/1934)
 
-
-## 0.7.2 (January 17, 2014)
+## 0.7.2 (January 17, 2013)
 
 * Fixed a bug that appeared with **Chrome 32 update** that made all **mouse events shifted on scrolled pages**. [#2352](https://github.com/Leaflet/Leaflet/issues/2352)
 * Fixed a bug that could break tile loading when using non-standard tile sizes. [#2288](https://github.com/Leaflet/Leaflet/issues/2288)

CONTRIBUTING.md

@@ -98,14 +98,17 @@ Happy coding!
 
 ## Running the Tests
 
-To run the tests from the command line,
-install [PhantomJS](http://phantomjs.org/) (and make sure it's in your `PATH`),
-then run:
+To run the tests from the command line, first make sure you have installed all
+the build system requirements with `npm install`. Then, simply run:
 
 ```
-jake test
+npm test
 ```
 
+By default, the tests will run in [PhantomJS](http://phantomjs.org/), and also
+in [SlimerJS](https://slimerjs.org/) if possible. If `npm test` complains about
+PhantomJS, install it manually and make sure it's in your `PATH`.
+
 To run all the tests in actual browsers at the same time, you can do:
 
 ```

bower.json

@@ -1,11 +1,17 @@
 {
   "name": "leaflet",
+  "version": "0.7.8",
   "description": "JavaScript library for mobile-friendly interactive maps",
   "main": [
     "dist/leaflet.css",
-    "dist/leaflet-src.js"
+    "dist/leaflet-src.js",
+    "dist/images/layers-2x.png",
+    "dist/images/layers.png",
+    "dist/images/marker-icon-2x.png",
+    "dist/images/marker-icon.png",
+    "dist/images/marker-shadow.png"
   ],
-   "ignore": [
+  "ignore": [
     ".*",
     "CHANGELOG.json",
     "FAQ.md",

build/bower.json

@@ -0,0 +1,22 @@
+{
+  "name": "leaflet",
+  "description": "JavaScript library for mobile-friendly interactive maps",
+  "main": [
+    "dist/leaflet.css",
+    "dist/leaflet-src.js",
+    "dist/images/layers-2x.png",
+    "dist/images/layers.png",
+    "dist/images/marker-icon-2x.png",
+    "dist/images/marker-icon.png",
+    "dist/images/marker-shadow.png"
+  ],
+   "ignore": [
+    ".*",
+    "CHANGELOG.json",
+    "FAQ.md",
+    "debug",
+    "spec",
+    "src",
+    "build"
+  ]
+}

build/build.js

@@ -191,10 +191,22 @@ exports.build = function (callback, version, compsBase32, buildName) {
 
 exports.test = function(complete, fail) {
 	var karma = require('karma'),
-	    testConfig = {configFile : __dirname + '/../spec/karma.conf.js'};
+	    testConfig = {configFile : __dirname + '/../spec/karma.conf.js'},
+	    autoSlimer = false;
 
 	testConfig.browsers = ['PhantomJS'];
 
+	try {
+		var child = require('child_process').execFileSync(
+			require('slimerjs').path
+		);
+		console.log('Running tests with both PhantomJS and SlimerJS');
+		testConfig.browsers.push('SlimerJS');
+		autoSlimer = true;
+	} catch(e) {
+		console.log('Cannot start SlimerJS, will run tests only in PhantomJS');
+	}
+
 	function isArgv(optName) {
 		return process.argv.indexOf(optName) !== -1;
 	}
@@ -226,12 +238,26 @@ exports.test = function(complete, fail) {
 	console.log('Running tests...');
 
 	var server = new karma.Server(testConfig, function(exitCode) {
+
+		// Work around https://github.com/karma-runner/karma-slimerjs-launcher/issues/1
+		if (autoSlimer && require('os').platform() !== 'win32' ) {	// Kill process only in linux/osx, as win32 seems to work fine
+			var slimerjsPids = require('child_process').execSync('ps -Af | grep slimerjs | grep xulrunner | awk \'{print $2}\'').toString();
+			slimerjsPids = slimerjsPids.trim().split('\n');
+			for (var i=0; i<slimerjsPids.length; i++) {
+				try {
+					var pid = Number(slimerjsPids[i]);
+					require('child_process').execSync('ps -A | grep ' + pid + ' && kill ' + pid);
+				} catch(e) {}
+			}
+		}
+
 		if (!exitCode) {
 			console.log('\tTests ran successfully.\n');
 			complete();
 		} else {
 			process.exit(exitCode);
 		}
 	});
+
 	server.start();
 };

build/component.json

@@ -0,0 +1,19 @@
+{
+  "name": "leaflet",
+  "description": "JavaScript library for mobile-friendly interactive maps",
+  "scripts": [
+    "dist/leaflet.js",
+    "dist/leaflet-src.js"
+  ],
+  "images":[
+    "dist/images/layers-2x.png",
+    "dist/images/layers.png",
+    "dist/images/marker-icon-2x.png",
+    "dist/images/marker-icon.png",
+    "dist/images/marker-shadow.png"
+  ],
+  "styles":[
+    "dist/leaflet.css"
+  ],
+  "main": "dist/leaflet-src.js"
+}

build/publish.sh

@@ -8,8 +8,12 @@ npm test || exit 1
 
 git checkout -b build
 
-jake build[,,true]
-git add dist/leaflet-src.js dist/leaflet.js dist/leaflet-src.map -f
+npm run build
+git add dist/leaflet-src.js dist/leaflet.js -f
+
+copyfiles -u 1 build/*.json ./
+tin -v $VERSION
+git add component.json bower.json -f
 
 git commit -m "v$VERSION"
 

component.json

@@ -0,0 +1,20 @@
+{
+  "name": "leaflet",
+  "version": "0.7.8",
+  "description": "JavaScript library for mobile-friendly interactive maps",
+  "scripts": [
+    "dist/leaflet.js",
+    "dist/leaflet-src.js"
+  ],
+  "images": [
+    "dist/images/layers-2x.png",
+    "dist/images/layers.png",
+    "dist/images/marker-icon-2x.png",
+    "dist/images/marker-icon.png",
+    "dist/images/marker-shadow.png"
+  ],
+  "styles": [
+    "dist/leaflet.css"
+  ],
+  "main": "dist/leaflet-src.js"
+}

debug/tests/setview_marker_setview.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Leaflet debug page</title>
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+
+    <link rel="stylesheet" href="../css/screen.css" />
+
+    <link rel="stylesheet" href="../../dist/leaflet.css" />
+</head>
+<body>
+    <div id="map" style=></div>
+    <script type="text/javascript" src="../../build/deps.js"></script>
+    <script src="../leaflet-include.js"></script>
+    <script>
+        map = L.map('map');
+        L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.jpg').addTo(map);
+        map.setView([51.505, -0.09], 15);
+        L.circleMarker([51.5, -0.09], {}).addTo(map);
+        L.marker([51.505, -0.09]).addTo(map);
+        map.setZoom(14); //comment this to make it work
+    </script>
+</body>
+</html>