Fix to fullscreen button, removed link to old app.

The exit fullscreen button on the map wasn't stopping click propagation, so it was identifying the map feature under the button on exit. Also removed link to old app now that IE9 has finally been (mostly) killed by Microsoft.
tobinbradley · Jan 13, 2016 · f294320 · f294320
1 parent 8e2fc13
commit f294320
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/app/index.html b/app/index.html
@@ -29,18 +29,12 @@
 	<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" rel="stylesheet">
 	<link rel="stylesheet" href="css/main.css?foo={{cachebuster}}">
 
-	<!--[if IE]>
-		<script src="//cdnjs.cloudflare.com/ajax/libs/es5-shim/4.1.7/es5-shim.min.js"></script>
-		<script src="//cdnjs.cloudflare.com/ajax/libs/classlist/2014.01.31/classList.min.js"></script>
-		<script src="//cdnjs.cloudflare.com/ajax/libs/selectivizr/1.0.2/selectivizr-min.js"></script>
-	<![endif]-->
 </head>
 
 <body>
 	<!--[if IE]>
 	<div class="oldie">
-		<p>You are using an outdated browser. <a href="http://whatbrowser.org/">Upgrade your browser today</a> to better experience this site.</p>
-		<p>You can view the old version of the site <a href="http://mcmap.org/ie9geoportal/">here</>.</p>
+		You are using an outdated browser. <a href="http://whatbrowser.org/">Upgrade your browser today</a> to better experience this site.
 	</div>
 	<![endif]-->
 	<div class="mdl-layout mdl-js-layout mdl-layout--fixed-drawer mdl-layout--fixed-header">

diff --git a/app/js/modules/fullscreen-control.js b/app/js/modules/fullscreen-control.js
@@ -1,4 +1,3 @@
-
 let L = require('leaflet/dist/leaflet');
 
 var customFullscreenToggle = L.Control.extend({
@@ -13,6 +12,8 @@ var customFullscreenToggle = L.Control.extend({
 
         container.innerHTML = 'Exit Full Screen';
 
+        L.DomEvent.disableClickPropagation(container);
+
         container.onclick = function() {
             map.toggleFullscreen();
         };

diff --git a/app/js/modules/map.js b/app/js/modules/map.js
@@ -123,6 +123,7 @@ global.addMarker = function(latlng, label, pid, address) {
 
 // add point of interest (something like nearby park) marker
 global.addtmpMarker = function(lat, lng, label, address) {
+    //document.querySelector('#map').scrollIntoView({ behavior: 'smooth', block: 'start' });
     if (typeof tmpMarker === 'object') {
        map.removeLayer(tmpMarker);
     }