From eee8019f9d2ddfbcd232e2236ae1a8da415b6a4a Mon Sep 17 00:00:00 2001 From: David Molineus Date: Thu, 6 Jul 2017 16:38:23 +0200 Subject: [PATCH] Update leaflet fullscreen. --- README.md | 2 +- assets/leaflet-fullscreen/Control.FullScreen.js | 2 +- assets/leaflet-fullscreen/Control.FullScreen.min.js | 2 +- assets/leaflet-fullscreen/README.md | 4 ++-- assets/leaflet-fullscreen/bower.json | 2 +- assets/leaflet-fullscreen/package.json | 2 +- module/config/config.php | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d130886..de914f7 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This package contains following packages: - [Leaflet.markercluster 1.0.2](https://github.com/Leaflet/Leaflet.markercluster) - [Leaflet-omnivore 0.3.4](https://github.com/mapbox/leaflet-omnivore) - [Leaflet.loading 0.1.24](https://github.com/ebrelsford/Leaflet.loading) - - [Leaflet.Control.FullScreen 1.4.2](https://github.com/brunob/leaflet.fullscreen) + - [Leaflet.Control.FullScreen 1.4.3](https://github.com/brunob/leaflet.fullscreen) - [Leaflet Control Geocoder 1.5.4](https://github.com/perliedman/leaflet-control-geocoder) - [Leaflet.ExtraMarkers 1.0.6](https://github.com/coryasilva/Leaflet.ExtraMarkers) - [osmtogeojson 2.2.12](https://github.com/tyrasd/osmtogeojson) diff --git a/assets/leaflet-fullscreen/Control.FullScreen.js b/assets/leaflet-fullscreen/Control.FullScreen.js index 093ea8b..54524de 100644 --- a/assets/leaflet-fullscreen/Control.FullScreen.js +++ b/assets/leaflet-fullscreen/Control.FullScreen.js @@ -155,7 +155,7 @@ source : http://johndyer.name/native-fullscreen-javascript-api-plus-jquery-plugi fullScreenApi.isFullScreen = function () { switch (this.prefix) { case '': - return document.fullScreen; + return document.fullscreen; case 'webkit': return document.webkitIsFullScreen; case 'ms': diff --git a/assets/leaflet-fullscreen/Control.FullScreen.min.js b/assets/leaflet-fullscreen/Control.FullScreen.min.js index d0ffd6c..5809989 100644 --- a/assets/leaflet-fullscreen/Control.FullScreen.min.js +++ b/assets/leaflet-fullscreen/Control.FullScreen.min.js @@ -1 +1 @@ -!function(){L.Control.FullScreen=L.Control.extend({options:{position:"topleft",title:"Full Screen",titleCancel:"Exit Full Screen",forceSeparateButton:!1,forcePseudoFullscreen:!1,fullscreenElement:!1},onAdd:function(e){var n,t="leaflet-control-zoom-fullscreen",l="";return n=e.zoomControl&&!this.options.forceSeparateButton?e.zoomControl._container:L.DomUtil.create("div","leaflet-bar"),this.options.content?l=this.options.content:t+=" fullscreen-icon",this._createButton(this.options.title,t,l,n,this.toggleFullScreen,this),this._map.on("enterFullscreen exitFullscreen",this._toggleTitle,this),n},_createButton:function(n,t,l,r,i,s){return this.link=L.DomUtil.create("a",t,r),this.link.href="#",this.link.title=n,this.link.innerHTML=l,L.DomEvent.addListener(this.link,"click",L.DomEvent.stopPropagation).addListener(this.link,"click",L.DomEvent.preventDefault).addListener(this.link,"click",i,s),L.DomEvent.addListener(r,e.fullScreenEventName,L.DomEvent.stopPropagation).addListener(r,e.fullScreenEventName,L.DomEvent.preventDefault).addListener(r,e.fullScreenEventName,this._handleEscKey,s),L.DomEvent.addListener(document,e.fullScreenEventName,L.DomEvent.stopPropagation).addListener(document,e.fullScreenEventName,L.DomEvent.preventDefault).addListener(document,e.fullScreenEventName,this._handleEscKey,s),this.link},toggleFullScreen:function(){var n=this._map;n._exitFired=!1,n._isFullscreen?(e.supportsFullScreen&&!this.options.forcePseudoFullscreen?e.cancelFullScreen(this.options.fullscreenElement?this.options.fullscreenElement:n._container):L.DomUtil.removeClass(n._container,"leaflet-pseudo-fullscreen"),n.invalidateSize(),n.fire("exitFullscreen"),n._exitFired=!0,n._isFullscreen=!1):(e.supportsFullScreen&&!this.options.forcePseudoFullscreen?e.requestFullScreen(this.options.fullscreenElement?this.options.fullscreenElement:n._container):L.DomUtil.addClass(n._container,"leaflet-pseudo-fullscreen"),n.invalidateSize(),n.fire("enterFullscreen"),n._isFullscreen=!0)},_toggleTitle:function(){this.link.title=this._map._isFullscreen?this.options.title:this.options.titleCancel},_handleEscKey:function(){var n=this._map;e.isFullScreen(n)||n._exitFired||(n.fire("exitFullscreen"),n._exitFired=!0,n._isFullscreen=!1)}}),L.Map.addInitHook(function(){this.options.fullscreenControl&&(this.fullscreenControl=L.control.fullscreen(this.options.fullscreenControlOptions),this.addControl(this.fullscreenControl))}),L.control.fullscreen=function(e){return new L.Control.FullScreen(e)};var e={supportsFullScreen:!1,isFullScreen:function(){return!1},requestFullScreen:function(){},cancelFullScreen:function(){},fullScreenEventName:"",prefix:""},n="webkit moz o ms khtml".split(" ");if("undefined"!=typeof document.exitFullscreen)e.supportsFullScreen=!0;else{for(var t=0,l=n.length;t 'Leaflet.Control.FullScreen', - 'version' => '1.4.2', + 'version' => '1.4.3', 'license' => 'MIT', 'homepage' => 'https://github.com/brunob/leaflet.fullscreen', 'css' => 'assets/leaflet/libs/leaflet-fullscreen/Control.FullScreen.min.css',