From e893f60ce9a95318660389d06c3afe4fc6c3a4ee Mon Sep 17 00:00:00 2001
From: Masashi Hirano <cherrydog07@gmail.com>
Date: Sat, 26 Aug 2017 23:44:34 +0900
Subject: [PATCH] fix event on fullscreen of Edge

---
 lib/toggleFullscreen.js | 9 +++++----
 package.json            | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/toggleFullscreen.js b/lib/toggleFullscreen.js
index f34f800..92c8bc4 100644
--- a/lib/toggleFullscreen.js
+++ b/lib/toggleFullscreen.js
@@ -7,7 +7,6 @@ var Promise = require('es6-promise').Promise;
 function toggleFullscreen(element, callback) {
   if (callback) {
     if (!isFullscreen()) {
-      enterFullscreen(element);
       fullScreenChange(function() {
         if (isFullscreen()) {
           callback(true);
@@ -15,6 +14,7 @@ function toggleFullscreen(element, callback) {
           callback(false);
         }
       });
+      enterFullscreen(element);
     } else {
       exitFullscreen();
       callback(false);
@@ -23,7 +23,6 @@ function toggleFullscreen(element, callback) {
   }
   return new Promise(function(resolve, reject) {
     if (!isFullscreen()) {
-      enterFullscreen(element);
       fullScreenChange(function() {
         if (isFullscreen()) {
           resolve(true);
@@ -31,6 +30,7 @@ function toggleFullscreen(element, callback) {
           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
index 3842bb3..61517c4 100644
--- 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": {