From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 14 Dec 2018 17:57:27 +0000 (+0100)
Subject: #2440
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=434b96bf7d166013545cf490962de3e53cb1dd96;p=fluidbook-html5.git

#2440
---

diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index c7d0bbbc..2d48c55b 100644
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -662,35 +662,6 @@ FluidbookNav.prototype = {
             $this.openSearch();
         });
 
-
-        if (this.fluidbook.support.fullscreen) {
-            // Full screen toggle
-            $(document).on('click', '.icon-fullscreen', function () {
-                $this.menuAPI.close();
-                screenfull.toggle();
-                return false;
-            });
-
-
-            // Toggle icon on fullscreen change (also handles exiting via ESC key)
-            screenfull.on('change', function () {
-                resize();
-                // Slight delay to stop icon state flickering during fullscreen transition
-                setTimeout(function () {
-                    if (screenfull.isFullscreen) {
-                        $('.icon-fullscreen').addClass('active');
-                    } else {
-                        $('.icon-fullscreen').removeClass('active');
-                    }
-                    resize();
-                }, 250);
-
-                setTimeout(function () {
-                    resize();
-                }, 1000);
-            });
-        }
-
         // Share icon
         $(document).on('click', '.icon-share', function () {
             if ($this.fluidbook.datas.phonegap != 'android') {
@@ -741,7 +712,9 @@ FluidbookNav.prototype = {
             return false;
         });
 
-        this.initFullScreen();
+        if (this.fluidbook.support.fullscreen) {
+            this.initFullScreen();
+        }
     },
 
     initFullScreen: function () {
@@ -755,24 +728,23 @@ FluidbookNav.prototype = {
         });
 
         // Toggle icon on fullscreen change (also handles exiting via ESC key)
-        if (screenfull.enabled) {
-            screenfull.on('change', function () {
+        screenfull.on('change', function () {
+            resize();
+            // Slight delay to stop icon state flickering during fullscreen transition
+            setTimeout(function () {
+                if (screenfull.isFullscreen) {
+                    $('.icon-fullscreen').addClass('active');
+                } else {
+                    $('.icon-fullscreen').removeClass('active');
+                }
                 resize();
-                // Slight delay to stop icon state flickering during fullscreen transition
-                setTimeout(function () {
-                    if (screenfull.isFullscreen) {
-                        $('.icon-fullscreen').addClass('active');
-                    } else {
-                        $('.icon-fullscreen').removeClass('active');
-                    }
-                    resize();
-                }, 250);
+            }, 250);
+
+            setTimeout(function () {
+                resize();
+            }, 1000);
+        });
 
-                setTimeout(function () {
-                    resize();
-                }, 1000);
-            });
-        }
     },
 
     openSearch: function (q, cb) {