From 0d1eae32be3bc0269ec01e82cbe8874d4df618a8 Mon Sep 17 00:00:00 2001
From: Thach Hoang <thachhoang@users.noreply.github.com>
Date: Tue, 28 Mar 2017 02:40:48 -0400
Subject: [PATCH] Fix debug examples after rollup (#5417)

Fix #5373.

- Remove references to removed file "../../build/deps.js"
- Update leaflet-include.js to point to "../dist/leaflet-src.js"
- Update watch to use the same destination file as rollup (dist/leaflet-src.js)
- Define getRandomLatLng where used
---
 build/rollup-watch-config.js                 |  2 +-
 debug/hacks/jitter.html                      |  1 -
 debug/leaflet-include.js                     |  2 +-
 debug/map/canvas.html                        |  1 -
 debug/map/control-layers.html                |  1 -
 debug/map/controls.html                      |  1 -
 debug/map/geolocation.html                   |  1 -
 debug/map/grid.html                          |  1 -
 debug/map/image-overlay.html                 |  1 -
 debug/map/layer_remove_add.html              |  1 -
 debug/map/map-mobile.html                    |  1 -
 debug/map/map-popup.html                     |  1 -
 debug/map/map.html                           | 15 ++++++-
 debug/map/markers.html                       |  1 -
 debug/map/max-bounds-bouncy.html             |  1 -
 debug/map/max-bounds-infinite.html           |  1 -
 debug/map/max-bounds.html                    |  1 -
 debug/map/opacity.html                       |  1 -
 debug/map/popup.html                         | 45 ++++++++++++--------
 debug/map/rollup.html                        |  3 +-
 debug/map/scroll.html                        |  1 -
 debug/map/simple-proj.html                   |  1 -
 debug/map/tile-debug.html                    |  1 -
 debug/map/tile-opacity.html                  |  1 -
 debug/map/tooltip.html                       |  1 -
 debug/map/wms-marble.html                    |  1 -
 debug/map/wms.html                           |  1 -
 debug/map/zoom-delta.html                    |  1 -
 debug/map/zoom-remain-centered.html          |  1 -
 debug/map/zoomlevels.html                    | 15 ++++++-
 debug/map/zoompan.html                       |  1 -
 debug/tests/add_remove_layers.html           |  1 -
 debug/tests/bringtoback.html                 |  1 -
 debug/tests/canvasloop.html                  |  1 -
 debug/tests/click_on_canvas.html             |  1 -
 debug/tests/custom-panes.html                |  1 -
 debug/tests/detached-dom-memory-leak.html    |  1 -
 debug/tests/doubleclick-events-slowdown.html | 14 +++++-
 debug/tests/dragging_and_copyworldjump.html  |  1 -
 debug/tests/dragging_cursors.html            |  1 -
 debug/tests/event-perf-2.html                | 15 ++++++-
 debug/tests/event-perf.html                  |  1 -
 debug/tests/mousemove_on_polygons.html       |  1 -
 debug/tests/opacity.html                     |  1 -
 debug/tests/popup_offset.html                |  1 -
 debug/tests/popupcontextmenuclicks.html      |  1 -
 debug/tests/remove_while_dragging.html       |  1 -
 debug/tests/removetilewhilepan.html          |  1 -
 debug/tests/reuse_popups.html                |  1 -
 debug/tests/rtl.html                         |  1 -
 debug/tests/rtl2.html                        |  1 -
 debug/tests/set_icon_reuse_dom.html          |  1 -
 debug/tests/svg_clicks.html                  |  1 -
 debug/tests/tile-bounds.html                 |  1 -
 debug/tests/tile-events.html                 |  1 -
 debug/tests/tile-opacity.html                |  1 -
 debug/tests/touch-shake.html                 |  1 -
 debug/tests/touch-zoom-bounce.html           |  1 -
 debug/vector/bounds-extend.html              |  1 -
 debug/vector/feature-group-bounds.html       |  1 -
 debug/vector/geojson.html                    |  1 -
 debug/vector/moving-canvas.html              |  1 -
 debug/vector/rectangle.html                  |  1 -
 debug/vector/touchzoomemu.html               |  1 -
 debug/vector/vector-bounds.html              |  1 -
 debug/vector/vector-canvas.html              |  1 -
 debug/vector/vector-mobile.html              |  1 -
 debug/vector/vector-simple.html              |  1 -
 debug/vector/vector.html                     |  1 -
 debug/vector/vector2.html                    |  1 -
 70 files changed, 82 insertions(+), 91 deletions(-)

diff --git a/build/rollup-watch-config.js b/build/rollup-watch-config.js
index aab3ba11e..5f99ea41c 100644
--- a/build/rollup-watch-config.js
+++ b/build/rollup-watch-config.js
@@ -34,7 +34,7 @@ export default {
 	moduleName: 'L',
 	banner: warningCode,
 	entry: 'src/Leaflet.js',
-	dest: 'debug/leaflet-rollup-src.js',
+	dest: 'dist/leaflet-src.js',
 	plugins: [
 		rollupGitVersion()
 	],
diff --git a/debug/hacks/jitter.html b/debug/hacks/jitter.html
index c34224012..09be27deb 100644
--- a/debug/hacks/jitter.html
+++ b/debug/hacks/jitter.html
@@ -8,7 +8,6 @@
 	<meta name="viewport" content="width=device-width,initial-scale=1 maximum-scale=1.0 user-scalable=0">
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/leaflet-include.js b/debug/leaflet-include.js
index 8681426b7..23dfb1d9b 120000
--- a/debug/leaflet-include.js
+++ b/debug/leaflet-include.js
@@ -1 +1 @@
-leaflet-rollup-src.js
\ No newline at end of file
+../dist/leaflet-src.js
\ No newline at end of file
diff --git a/debug/map/canvas.html b/debug/map/canvas.html
index 3dd464fc0..9234b356c 100644
--- a/debug/map/canvas.html
+++ b/debug/map/canvas.html
@@ -7,7 +7,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/control-layers.html b/debug/map/control-layers.html
index b11e88f37..3ca2e0d9d 100644
--- a/debug/map/control-layers.html
+++ b/debug/map/control-layers.html
@@ -7,7 +7,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/controls.html b/debug/map/controls.html
index c0f8de082..78961bf0e 100644
--- a/debug/map/controls.html
+++ b/debug/map/controls.html
@@ -7,7 +7,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/geolocation.html b/debug/map/geolocation.html
index 7a69f8357..27ce38048 100644
--- a/debug/map/geolocation.html
+++ b/debug/map/geolocation.html
@@ -8,7 +8,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <link rel="stylesheet" href="../css/screen.css" />
-    <script src="../../build/deps.js"></script>
     <script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/grid.html b/debug/map/grid.html
index 7df7d6e73..11f4b6005 100644
--- a/debug/map/grid.html
+++ b/debug/map/grid.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/image-overlay.html b/debug/map/image-overlay.html
index c25c88d7b..c3b6d440d 100644
--- a/debug/map/image-overlay.html
+++ b/debug/map/image-overlay.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/layer_remove_add.html b/debug/map/layer_remove_add.html
index 0e2c81a85..ce7734e27 100644
--- a/debug/map/layer_remove_add.html
+++ b/debug/map/layer_remove_add.html
@@ -9,7 +9,6 @@
 
     <link rel="stylesheet" href="../css/screen.css" />
 
-    <script src="../../build/deps.js"></script>
     <script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/map-mobile.html b/debug/map/map-mobile.html
index 1a9354cec..e7a4e4fa8 100644
--- a/debug/map/map-mobile.html
+++ b/debug/map/map-mobile.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/mobile.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/map-popup.html b/debug/map/map-popup.html
index 1ea588fa1..f1d33257c 100644
--- a/debug/map/map-popup.html
+++ b/debug/map/map-popup.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/map.html b/debug/map/map.html
index f8e1e23ac..1822709af 100644
--- a/debug/map/map.html
+++ b/debug/map/map.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
@@ -29,9 +28,21 @@
 
 		var markers = new L.FeatureGroup();
 
+		function getRandomLatLng(llbounds) {
+			var s = llbounds.getSouth(),
+			    n = llbounds.getNorth(),
+			    w = llbounds.getWest(),
+			    e = llbounds.getEast();
+
+			return L.latLng(
+				s + (Math.random() * (n - s)),
+				w + (Math.random() * (e - w))
+			)
+		}
+
 		function populate() {
 			for (var i = 0; i < 10; i++) {
-				L.marker(getRandomLatLng(map)).addTo(markers);
+				L.marker(getRandomLatLng(map.getBounds())).addTo(markers);
 			}
 			return false;
 		}
diff --git a/debug/map/markers.html b/debug/map/markers.html
index d78e03bf7..07bf9d5a2 100644
--- a/debug/map/markers.html
+++ b/debug/map/markers.html
@@ -9,7 +9,6 @@
 
     <link rel="stylesheet" href="../css/screen.css" />
 
-    <script src="../../build/deps.js"></script>
     <script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/max-bounds-bouncy.html b/debug/map/max-bounds-bouncy.html
index be9fe204f..464c4cf6e 100644
--- a/debug/map/max-bounds-bouncy.html
+++ b/debug/map/max-bounds-bouncy.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/mobile.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/max-bounds-infinite.html b/debug/map/max-bounds-infinite.html
index a4641254b..01ca04fc2 100644
--- a/debug/map/max-bounds-infinite.html
+++ b/debug/map/max-bounds-infinite.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/mobile.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/max-bounds.html b/debug/map/max-bounds.html
index 130f83ded..4e4e6fae1 100644
--- a/debug/map/max-bounds.html
+++ b/debug/map/max-bounds.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/mobile.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/opacity.html b/debug/map/opacity.html
index b75f24f62..fdeb56f2e 100644
--- a/debug/map/opacity.html
+++ b/debug/map/opacity.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 	<style>
 		.mapcontainer {
diff --git a/debug/map/popup.html b/debug/map/popup.html
index 710426c88..7a209eeab 100644
--- a/debug/map/popup.html
+++ b/debug/map/popup.html
@@ -9,7 +9,6 @@
 
   <link rel="stylesheet" href="../css/screen.css" />
 
-  <script src="../../build/deps.js"></script>
   <script src="../leaflet-include.js"></script>
 </head>
 <body>
@@ -26,18 +25,30 @@
         .setView([50.5, 30.51], 15)
         .addLayer(osm);
 
+    function getRandomLatLng(llbounds) {
+      var s = llbounds.getSouth(),
+          n = llbounds.getNorth(),
+          w = llbounds.getWest(),
+          e = llbounds.getEast();
+
+      return L.latLng(
+        s + (Math.random() * (n - s)),
+        w + (Math.random() * (e - w))
+      )
+    }
+
     var features = new L.FeatureGroup([
-      L.marker(getRandomLatLng(map)),
+      L.marker(getRandomLatLng(map.getBounds())),
       L.polyline([
-        getRandomLatLng(map),
-        getRandomLatLng(map),
-        getRandomLatLng(map)
+        getRandomLatLng(map.getBounds()),
+        getRandomLatLng(map.getBounds()),
+        getRandomLatLng(map.getBounds())
       ]),
       L.polygon([
-        getRandomLatLng(map),
-        getRandomLatLng(map),
-        getRandomLatLng(map),
-        getRandomLatLng(map)
+        getRandomLatLng(map.getBounds()),
+        getRandomLatLng(map.getBounds()),
+        getRandomLatLng(map.getBounds()),
+        getRandomLatLng(map.getBounds())
       ])
     ]);
 
@@ -49,23 +60,23 @@
     content.innerText = 'I\'m a red polygon';
 
     var polygon = L.polygon([
-      getRandomLatLng(map),
-      getRandomLatLng(map),
-      getRandomLatLng(map),
-      getRandomLatLng(map)
+      getRandomLatLng(map.getBounds()),
+      getRandomLatLng(map.getBounds()),
+      getRandomLatLng(map.getBounds()),
+      getRandomLatLng(map.getBounds())
     ], {
       color: 'red'
     }).bindPopup(content).addTo(map);
 
     var polyline = L.polyline([
-      getRandomLatLng(map),
-      getRandomLatLng(map),
-      getRandomLatLng(map)
+      getRandomLatLng(map.getBounds()),
+      getRandomLatLng(map.getBounds()),
+      getRandomLatLng(map.getBounds())
     ], {
       color: 'red'
     }).bindPopup('I\'m a red polyline').addTo(map);
 
-    var marker = L.circleMarker(getRandomLatLng(map), {
+    var marker = L.circleMarker(getRandomLatLng(map.getBounds()), {
       color: 'red',
       radius: 25
     }).bindPopup('I\'m a red circle').addTo(map);
diff --git a/debug/map/rollup.html b/debug/map/rollup.html
index c8f3d0c10..2b85ea9e6 100644
--- a/debug/map/rollup.html
+++ b/debug/map/rollup.html
@@ -9,8 +9,7 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-<!-- 	<script src="../../dist/leaflet-rollup-src.js"></script> -->
-	<script src="../leaflet-rollup-src.js"></script>
+	<script src="../../dist/leaflet-src.js"></script>
 
 </head>
 <body>
diff --git a/debug/map/scroll.html b/debug/map/scroll.html
index 77022ef58..cb1caef2a 100644
--- a/debug/map/scroll.html
+++ b/debug/map/scroll.html
@@ -7,7 +7,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/simple-proj.html b/debug/map/simple-proj.html
index d851af629..275dea8d1 100644
--- a/debug/map/simple-proj.html
+++ b/debug/map/simple-proj.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/tile-debug.html b/debug/map/tile-debug.html
index d18f3c454..39a0b5ba6 100644
--- a/debug/map/tile-debug.html
+++ b/debug/map/tile-debug.html
@@ -65,7 +65,6 @@
     }
     </style>
 
-    <script src="../../build/deps.js"></script>
     <script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/tile-opacity.html b/debug/map/tile-opacity.html
index 22294223b..5ddf63642 100644
--- a/debug/map/tile-opacity.html
+++ b/debug/map/tile-opacity.html
@@ -7,7 +7,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/tooltip.html b/debug/map/tooltip.html
index d09506c73..a1c3ed535 100644
--- a/debug/map/tooltip.html
+++ b/debug/map/tooltip.html
@@ -7,7 +7,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 	<style type="text/css">
 		.my-div-icon {
diff --git a/debug/map/wms-marble.html b/debug/map/wms-marble.html
index 45743ac20..fdf67e803 100644
--- a/debug/map/wms-marble.html
+++ b/debug/map/wms-marble.html
@@ -7,7 +7,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/wms.html b/debug/map/wms.html
index 17c4ac426..67f4f3592 100644
--- a/debug/map/wms.html
+++ b/debug/map/wms.html
@@ -7,7 +7,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/zoom-delta.html b/debug/map/zoom-delta.html
index 5f1ead4c7..b2c33032b 100644
--- a/debug/map/zoom-delta.html
+++ b/debug/map/zoom-delta.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/mobile.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 	<style>
 	.container {
diff --git a/debug/map/zoom-remain-centered.html b/debug/map/zoom-remain-centered.html
index 862360c79..55ec80df5 100644
--- a/debug/map/zoom-remain-centered.html
+++ b/debug/map/zoom-remain-centered.html
@@ -7,7 +7,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/map/zoomlevels.html b/debug/map/zoomlevels.html
index 10ad976c8..0686efcf6 100644
--- a/debug/map/zoomlevels.html
+++ b/debug/map/zoomlevels.html
@@ -7,7 +7,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
@@ -31,8 +30,20 @@
 
 		L.control.scale().addTo(map);
 
+		function getRandomLatLng(llbounds) {
+			var s = llbounds.getSouth(),
+			    n = llbounds.getNorth(),
+			    w = llbounds.getWest(),
+			    e = llbounds.getEast();
+
+			return L.latLng(
+				s + (Math.random() * (n - s)),
+				w + (Math.random() * (e - w))
+			)
+		}
+
 		for (var i = 0; i < 1000; i++) {
-			L.marker(getRandomLatLng(map)).addTo(map);
+			L.marker(getRandomLatLng(map.getBounds())).addTo(map);
 		}
 
 
diff --git a/debug/map/zoompan.html b/debug/map/zoompan.html
index 162ec61bd..cd89121d0 100644
--- a/debug/map/zoompan.html
+++ b/debug/map/zoompan.html
@@ -19,7 +19,6 @@
 	}
 	</style>
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/tests/add_remove_layers.html b/debug/tests/add_remove_layers.html
index e3a03e50a..df20a0aab 100644
--- a/debug/tests/add_remove_layers.html
+++ b/debug/tests/add_remove_layers.html
@@ -9,7 +9,6 @@
 
     <link rel="stylesheet" href="../css/screen.css" />
 
-    <script src="../../build/deps.js"></script>
     <script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/tests/bringtoback.html b/debug/tests/bringtoback.html
index c37306c54..e6460255a 100644
--- a/debug/tests/bringtoback.html
+++ b/debug/tests/bringtoback.html
@@ -8,7 +8,6 @@
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
 
 	<link rel="stylesheet" href="../css/screen.css" />
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/tests/canvasloop.html b/debug/tests/canvasloop.html
index 6b3292053..76e873e50 100644
--- a/debug/tests/canvasloop.html
+++ b/debug/tests/canvasloop.html
@@ -3,7 +3,6 @@
     <link rel="stylesheet" href="../../dist/leaflet.css" />
     <link rel="stylesheet" href="../css/screen.css" />
 
-        <script src="../../build/deps.js"></script>
 
         <script src="../leaflet-include.js"></script>
     </head>
diff --git a/debug/tests/click_on_canvas.html b/debug/tests/click_on_canvas.html
index 3f0749aa9..e63d1fdd8 100644
--- a/debug/tests/click_on_canvas.html
+++ b/debug/tests/click_on_canvas.html
@@ -9,7 +9,6 @@
 
     <link rel="stylesheet" href="../css/screen.css" />
 
-    <script src="../../build/deps.js"></script>
     <script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/tests/custom-panes.html b/debug/tests/custom-panes.html
index 6c5464f26..ab5287b81 100644
--- a/debug/tests/custom-panes.html
+++ b/debug/tests/custom-panes.html
@@ -9,7 +9,6 @@
 	
 	<link rel="stylesheet" href="../css/screen.css" />
 	
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 	
 	<style>
diff --git a/debug/tests/detached-dom-memory-leak.html b/debug/tests/detached-dom-memory-leak.html
index f69b8ff6c..505ab6998 100644
--- a/debug/tests/detached-dom-memory-leak.html
+++ b/debug/tests/detached-dom-memory-leak.html
@@ -5,7 +5,6 @@
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<link rel="stylesheet" href="../css/screen.css" />
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 	<script>
 	var map,
diff --git a/debug/tests/doubleclick-events-slowdown.html b/debug/tests/doubleclick-events-slowdown.html
index 650fc280a..22bf3df6d 100644
--- a/debug/tests/doubleclick-events-slowdown.html
+++ b/debug/tests/doubleclick-events-slowdown.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
@@ -35,12 +34,23 @@
 			return function(ev) { document.getElementById('perf').innerHTML = ('Event on marker ' + i + ': ' + ev.type); }
 		}
 
+		function getRandomLatLng(llbounds) {
+			var s = llbounds.getSouth(),
+			    n = llbounds.getNorth(),
+			    w = llbounds.getWest(),
+			    e = llbounds.getEast();
+
+			return L.latLng(
+				s + (Math.random() * (n - s)),
+				w + (Math.random() * (e - w))
+			)
+		}
 
 		function populate() {
 			var start = performance ? performance.now() : 0;
 
 			for (var i = 0; i < 100; i++) {
-				L.marker(getRandomLatLng(map)).addTo(markers).on('dblclick', getEventHandler(i));
+				L.marker(getRandomLatLng(map.getBounds())).addTo(markers).on('dblclick', getEventHandler(i));
 			}
 
 			var end = performance ? performance.now() : 0;
diff --git a/debug/tests/dragging_and_copyworldjump.html b/debug/tests/dragging_and_copyworldjump.html
index deb26066d..6efdee381 100644
--- a/debug/tests/dragging_and_copyworldjump.html
+++ b/debug/tests/dragging_and_copyworldjump.html
@@ -9,7 +9,6 @@
 		<link rel="stylesheet" href="../../dist/leaflet.css" />
 
 		<link rel="stylesheet" href="../css/screen.css" />
-		<script src="../../build/deps.js"></script>
 		<script src="../leaflet-include.js"></script>
 	</head>
 	<body>
diff --git a/debug/tests/dragging_cursors.html b/debug/tests/dragging_cursors.html
index 1033601d0..cd211ce1d 100644
--- a/debug/tests/dragging_cursors.html
+++ b/debug/tests/dragging_cursors.html
@@ -9,7 +9,6 @@
 		<link rel="stylesheet" href="../../dist/leaflet.css" />
 
 		<link rel="stylesheet" href="../css/screen.css" />
-		<script src="../../build/deps.js"></script>
 		<script src="../leaflet-include.js"></script>
 	</head>
 	<body>
diff --git a/debug/tests/event-perf-2.html b/debug/tests/event-perf-2.html
index dd5a3554f..c3f96305b 100644
--- a/debug/tests/event-perf-2.html
+++ b/debug/tests/event-perf-2.html
@@ -9,7 +9,6 @@
 
     <link rel="stylesheet" href="../css/screen.css" />
 
-    <script src="../../build/deps.js"></script>
     <script src="../leaflet-include.js"></script>
 </head>
 <body>
@@ -41,6 +40,18 @@
             clicks++;
         });
 
+        function getRandomLatLng(llbounds) {
+            var s = llbounds.getSouth(),
+                n = llbounds.getNorth(),
+                w = llbounds.getWest(),
+                e = llbounds.getEast();
+
+            return L.latLng(
+                s + (Math.random() * (n - s)),
+                w + (Math.random() * (e - w))
+            )
+        }
+
         function shuffleMarkers() {
             var marker;
             if (markerArr.length > 2000) {
@@ -48,7 +59,7 @@
                 marker = markerArr.splice(i, 1)[0];
                 markers.removeLayer(marker);
             } else {
-                marker = L.marker(getRandomLatLng(map))
+                marker = L.marker(getRandomLatLng(map.getBounds()))
                     .on('mouseover', function() {
                         marker.setZIndexOffset(10000);
                     })
diff --git a/debug/tests/event-perf.html b/debug/tests/event-perf.html
index bc4a34b4d..a87f2d619 100644
--- a/debug/tests/event-perf.html
+++ b/debug/tests/event-perf.html
@@ -4,7 +4,6 @@
 <meta name="viewport" id="vp" content="initial-scale=1.0,user-scalable=no,maximum-scale=1,width=device-width" />
 
     <link rel="stylesheet" href="../../dist/leaflet.css" />
-    <script src="../../build/deps.js"></script>
     <script src="../leaflet-include.js"></script>
 
   <meta charset="utf-8">
diff --git a/debug/tests/mousemove_on_polygons.html b/debug/tests/mousemove_on_polygons.html
index cca24be3a..edd6a73a3 100644
--- a/debug/tests/mousemove_on_polygons.html
+++ b/debug/tests/mousemove_on_polygons.html
@@ -33,7 +33,6 @@
 			}
 		}
 	</style>
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 	<table>
 	<tr><td>           </td><td>Enter       </td><td>Move       </td><td>Exit       </td><td>Click       </td></tr>
diff --git a/debug/tests/opacity.html b/debug/tests/opacity.html
index 4c199a2d3..75f66b6bf 100644
--- a/debug/tests/opacity.html
+++ b/debug/tests/opacity.html
@@ -14,7 +14,6 @@
 		}
 
 	</style>
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/tests/popup_offset.html b/debug/tests/popup_offset.html
index 4e6253cda..3a86d08c2 100644
--- a/debug/tests/popup_offset.html
+++ b/debug/tests/popup_offset.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/tests/popupcontextmenuclicks.html b/debug/tests/popupcontextmenuclicks.html
index f6fe3cc38..49b72ca5a 100644
--- a/debug/tests/popupcontextmenuclicks.html
+++ b/debug/tests/popupcontextmenuclicks.html
@@ -9,7 +9,6 @@
 
     <link rel="stylesheet" href="../css/screen.css" />
 
-    <script src="../../build/deps.js"></script>
     <script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/tests/remove_while_dragging.html b/debug/tests/remove_while_dragging.html
index 9b21fff26..6539738e3 100644
--- a/debug/tests/remove_while_dragging.html
+++ b/debug/tests/remove_while_dragging.html
@@ -7,7 +7,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/tests/removetilewhilepan.html b/debug/tests/removetilewhilepan.html
index ed2f04645..8475b0fff 100644
--- a/debug/tests/removetilewhilepan.html
+++ b/debug/tests/removetilewhilepan.html
@@ -8,7 +8,6 @@
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
 
 	<link rel="stylesheet" href="../css/screen.css" />
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 	<script src="http://code.jquery.com/jquery-1.8.0.js"></script>
 </head>
diff --git a/debug/tests/reuse_popups.html b/debug/tests/reuse_popups.html
index a9c03b3f2..61a8219b2 100644
--- a/debug/tests/reuse_popups.html
+++ b/debug/tests/reuse_popups.html
@@ -6,7 +6,6 @@
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
 
 	<link rel="stylesheet" href="../css/screen.css" />
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/tests/rtl.html b/debug/tests/rtl.html
index e5962a73e..be707200d 100644
--- a/debug/tests/rtl.html
+++ b/debug/tests/rtl.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 	<style>
 	body {
diff --git a/debug/tests/rtl2.html b/debug/tests/rtl2.html
index a40339907..7d913bec2 100644
--- a/debug/tests/rtl2.html
+++ b/debug/tests/rtl2.html
@@ -7,7 +7,6 @@
 
     <link rel="stylesheet" href="../css/mobile.css" />
 
-    <script src="../../build/deps.js"></script>
     <script src="../leaflet-include.js"></script>
     <style>
         #map { height: 100%; }
diff --git a/debug/tests/set_icon_reuse_dom.html b/debug/tests/set_icon_reuse_dom.html
index 27451cef9..e4bb7d489 100644
--- a/debug/tests/set_icon_reuse_dom.html
+++ b/debug/tests/set_icon_reuse_dom.html
@@ -5,7 +5,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/tests/svg_clicks.html b/debug/tests/svg_clicks.html
index acf5a6332..88c75ed18 100644
--- a/debug/tests/svg_clicks.html
+++ b/debug/tests/svg_clicks.html
@@ -8,7 +8,6 @@
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
 
 	<link rel="stylesheet" href="../css/screen.css" />
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 	<script src="http://code.jquery.com/jquery-1.8.0.js"></script>
 </head>
diff --git a/debug/tests/tile-bounds.html b/debug/tests/tile-bounds.html
index 4b0d64fb6..c5e6b757d 100644
--- a/debug/tests/tile-bounds.html
+++ b/debug/tests/tile-bounds.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 	<style>
 	#map {
diff --git a/debug/tests/tile-events.html b/debug/tests/tile-events.html
index bd3654b27..37a00b597 100644
--- a/debug/tests/tile-events.html
+++ b/debug/tests/tile-events.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 	<style>
 	#map {
diff --git a/debug/tests/tile-opacity.html b/debug/tests/tile-opacity.html
index 9dd92e122..71e1bd0c1 100644
--- a/debug/tests/tile-opacity.html
+++ b/debug/tests/tile-opacity.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 	<style>
 	</style>
diff --git a/debug/tests/touch-shake.html b/debug/tests/touch-shake.html
index 1e2ee994d..7ecdf14d4 100644
--- a/debug/tests/touch-shake.html
+++ b/debug/tests/touch-shake.html
@@ -11,7 +11,6 @@
 
 
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 
 	<script src="../../node_modules/prosthetic-hand/dist/prosthetic-hand.js"></script>
diff --git a/debug/tests/touch-zoom-bounce.html b/debug/tests/touch-zoom-bounce.html
index 44e5f25e3..201cb54d5 100644
--- a/debug/tests/touch-zoom-bounce.html
+++ b/debug/tests/touch-zoom-bounce.html
@@ -11,7 +11,6 @@
 
 
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 
 	<script src="../../node_modules/prosthetic-hand/dist/prosthetic-hand.js"></script>
diff --git a/debug/vector/bounds-extend.html b/debug/vector/bounds-extend.html
index 41dde4255..b4289542e 100644
--- a/debug/vector/bounds-extend.html
+++ b/debug/vector/bounds-extend.html
@@ -7,7 +7,6 @@
 
     <link rel="stylesheet" href="../css/screen.css" />
 
-    <script src="../../build/deps.js"></script>
     <script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/vector/feature-group-bounds.html b/debug/vector/feature-group-bounds.html
index b38903c95..092248558 100644
--- a/debug/vector/feature-group-bounds.html
+++ b/debug/vector/feature-group-bounds.html
@@ -7,7 +7,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/vector/geojson.html b/debug/vector/geojson.html
index e32b1e1fa..2e86277f8 100644
--- a/debug/vector/geojson.html
+++ b/debug/vector/geojson.html
@@ -40,7 +40,6 @@
 		}
 	</style>
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/vector/moving-canvas.html b/debug/vector/moving-canvas.html
index fb3a4cec4..56170f426 100644
--- a/debug/vector/moving-canvas.html
+++ b/debug/vector/moving-canvas.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/vector/rectangle.html b/debug/vector/rectangle.html
index b3b9045ca..9dd04f581 100644
--- a/debug/vector/rectangle.html
+++ b/debug/vector/rectangle.html
@@ -7,7 +7,6 @@
 
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/vector/touchzoomemu.html b/debug/vector/touchzoomemu.html
index b8dd4a73c..76b8e4428 100644
--- a/debug/vector/touchzoomemu.html
+++ b/debug/vector/touchzoomemu.html
@@ -7,7 +7,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/vector/vector-bounds.html b/debug/vector/vector-bounds.html
index 2834ec12b..8217a8af6 100644
--- a/debug/vector/vector-bounds.html
+++ b/debug/vector/vector-bounds.html
@@ -7,7 +7,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/vector/vector-canvas.html b/debug/vector/vector-canvas.html
index 36c051b65..7e58097c3 100644
--- a/debug/vector/vector-canvas.html
+++ b/debug/vector/vector-canvas.html
@@ -7,7 +7,6 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/vector/vector-mobile.html b/debug/vector/vector-mobile.html
index d743e4e5e..54d45ae1d 100644
--- a/debug/vector/vector-mobile.html
+++ b/debug/vector/vector-mobile.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/mobile.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/vector/vector-simple.html b/debug/vector/vector-simple.html
index 413ed68d7..1eda9a821 100644
--- a/debug/vector/vector-simple.html
+++ b/debug/vector/vector-simple.html
@@ -9,7 +9,6 @@
 
 	<link rel="stylesheet" href="../css/mobile.css" />
 
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/vector/vector.html b/debug/vector/vector.html
index 65181917d..333d57973 100644
--- a/debug/vector/vector.html
+++ b/debug/vector/vector.html
@@ -6,7 +6,6 @@
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
 
 	<link rel="stylesheet" href="../css/screen.css" />
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>
diff --git a/debug/vector/vector2.html b/debug/vector/vector2.html
index 029f2fb09..e8ee33849 100644
--- a/debug/vector/vector2.html
+++ b/debug/vector/vector2.html
@@ -6,7 +6,6 @@
 	<link rel="stylesheet" href="../../dist/leaflet.css" />
 
 	<link rel="stylesheet" href="../css/screen.css" />
-	<script src="../../build/deps.js"></script>
 	<script src="../leaflet-include.js"></script>
 </head>
 <body>