From bbfc93b1d80769406db34a54b0771c3b999257a4 Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Sun, 3 Jul 2016 11:25:39 +0200 Subject: [PATCH 1/3] Merge pull request #5548 from GaborFarkas/fullscreen_event_enum Fix CHANGETYPE in ol.control.FullScreen --- src/ol/control/fullscreencontrol.js | 38 +++++++++++++++++------------ 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/src/ol/control/fullscreencontrol.js b/src/ol/control/fullscreencontrol.js index c86584b4f2..976de1bf64 100644 --- a/src/ol/control/fullscreencontrol.js +++ b/src/ol/control/fullscreencontrol.js @@ -162,9 +162,9 @@ ol.control.FullScreen.prototype.handleFullScreenChange_ = function() { ol.control.FullScreen.prototype.setMap = function(map) { ol.control.Control.prototype.setMap.call(this, map); if (map) { - this.listenerKeys.push( - ol.events.listen(ol.global.document, ol.control.FullScreen.CHANGETYPE, - this.handleFullScreenChange_, this) + this.listenerKeys.push(ol.events.listen(ol.global.document, + ol.control.FullScreen.getChangeType_(), + this.handleFullScreenChange_, this) ); } }; @@ -238,18 +238,24 @@ ol.control.FullScreen.exitFullScreen = function() { }; /** - * @type {string} + * @return {string} Change type. + * @private */ -ol.control.FullScreen.CHANGETYPE = (function() { - var body = document.body; - if (body.webkitRequestFullscreen) { - return 'webkitfullscreenchange'; - } else if (body.mozRequestFullScreen) { - return 'mozfullscreenchange'; - } else if (body.msRequestFullscreen) { - return 'MSFullscreenChange'; - } else if (body.requestFullscreen) { - return 'fullscreenchange'; - } - return undefined; +ol.control.FullScreen.getChangeType_ = (function() { + var changeType; + return function() { + if (!changeType) { + var body = document.body; + if (body.webkitRequestFullscreen) { + changeType = 'webkitfullscreenchange'; + } else if (body.mozRequestFullScreen) { + changeType = 'mozfullscreenchange'; + } else if (body.msRequestFullscreen) { + changeType = 'MSFullscreenChange'; + } else if (body.requestFullscreen) { + changeType = 'fullscreenchange'; + } + } + return changeType; + }; })(); From 518212ce7d8d2f364c385354b37b5c4af7c6b793 Mon Sep 17 00:00:00 2001 From: Bart van den Eijnden Date: Mon, 4 Jul 2016 10:01:10 +0200 Subject: [PATCH 2/3] Changelog for v3.17.1 --- changelog/v3.17.1.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 changelog/v3.17.1.md diff --git a/changelog/v3.17.1.md b/changelog/v3.17.1.md new file mode 100644 index 0000000000..5a71863d65 --- /dev/null +++ b/changelog/v3.17.1.md @@ -0,0 +1,9 @@ +# v3.17.1 + +## Summary + +The v3.17.1 release is a patch release that addresses a regression in the v3.17.0 release. See the [v3.17.0 release notes](https://github.com/openlayers/ol3/releases/tag/v3.17.0) for details on upgrading from v3.16. + +## Fixes + + * [#5548](https://github.com/openlayers/ol3/pull/5548) - Fix CHANGETYPE in ol.control.FullScreen ([@GaborFarkas](https://github.com/GaborFarkas)) From eb92c268ab25a35381cc86d5968778ad5a1fd17a Mon Sep 17 00:00:00 2001 From: Bart van den Eijnden Date: Mon, 4 Jul 2016 10:01:47 +0200 Subject: [PATCH 3/3] Update package version to 3.17.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8cc3dca7f8..3eb9e8682a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openlayers", - "version": "3.17.0", + "version": "3.17.1", "description": "Build tools and sources for developing OpenLayers based mapping applications", "keywords": [ "map",