Compare commits

...

3 Commits

Author SHA1 Message Date
Bart van den Eijnden
eb92c268ab Update package version to 3.17.1 2016-07-04 10:01:47 +02:00
Bart van den Eijnden
518212ce7d Changelog for v3.17.1 2016-07-04 10:01:10 +02:00
Andreas Hocevar
bbfc93b1d8 Merge pull request #5548 from GaborFarkas/fullscreen_event_enum
Fix CHANGETYPE in ol.control.FullScreen
2016-07-04 09:59:03 +02:00
3 changed files with 32 additions and 17 deletions

9
changelog/v3.17.1.md Normal file
View File

@@ -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))

View File

@@ -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",

View File

@@ -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;
};
})();