fix event on fullscreen of Edge

shisama · Aug 26, 2017 · e893f60 · e893f60
1 parent a55c839
commit e893f60
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/toggleFullscreen.js b/lib/toggleFullscreen.js
@@ -7,14 +7,14 @@ var Promise = require('es6-promise').Promise;
 function toggleFullscreen(element, callback) {
  if (callback) {
  if (!isFullscreen()) {
- enterFullscreen(element);
  fullScreenChange(function() {
  if (isFullscreen()) {
  callback(true);
  } else {
  callback(false);
  }
  });
+ enterFullscreen(element);
  } else {
  exitFullscreen();
  callback(false);
@@ -23,14 +23,14 @@ function toggleFullscreen(element, callback) {
  }
  return new Promise(function(resolve, reject) {
  if (!isFullscreen()) {
- enterFullscreen(element);
  fullScreenChange(function() {
  if (isFullscreen()) {
  resolve(true);
  } else {
  resolve(false);
  }
  });
+ enterFullscreen(element);
  } else {
  exitFullscreen();
  resolve(false);
@@ -65,7 +65,7 @@ function toggleFullscreen(element, callback) {
  } else if (element.mozRequestFullScreen) {
  element.parentElement.mozRequestFullScreen();
  } else if (element.webkitRequestFullscreen) {
- element.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT);
+ element.webkitRequestFullscreen();
  }
  }
 
@@ -94,7 +94,8 @@ function toggleFullscreen(element, callback) {
  } else if (document.mozFullScreenEnabled) {
  document.addEventListener('mozfullscreenchange',callback);
  } else if (document.webkitFullscreenEnabled) {
- document.addEventListener('webkitfullscreenchange', callback);
+ document.addEventListener('webkitfullscreenchange', callback); //Safari
+ document.addEventListener('fullscreenChange', callback); // Edge
  } else if (document.msFullscreenEnabled) {
  document.addEventListener('MSFullscreenChange', callback);
  }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "toggle-fullscreen",
- "version": "0.2.1",
+ "version": "0.2.2",
  "description": "Simple to use Fullscreen API with Promise for cross-browser.",
  "main": "index.js",
  "scripts": {