From: Stephen Cameron <stephen@cubedesigners.com>
Date: Tue, 3 Oct 2017 13:53:49 +0000 (+0200)
Subject: Fix #1712 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=82e8e37b3a65f337c3a9aa652d084c2ea4f673fb;p=fluidbook-html5.git

Fix #1712 @0.5
---

diff --git a/js/libs/fluidbook/fluidbook.help.js b/js/libs/fluidbook/fluidbook.help.js
index 1a739ebe..c5812f82 100644
--- a/js/libs/fluidbook/fluidbook.help.js
+++ b/js/libs/fluidbook/fluidbook.help.js
@@ -64,7 +64,7 @@ FluidbookHelp.prototype = {
 				return;
 			}
 
-			var icon = $(this).find('.nav-icon');
+			var icon = $(this).find('.nav-icon:visible:first'); // Must get first visible icon so "toggle" icons work
 			var offset = icon.offset();
 			var left;
 
diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index 0bec1bce..21673204 100644
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -548,7 +548,10 @@ FluidbookNav.prototype = {
         // Toggle icon on fullscreen change (also handles exiting via ESC key)
         if (screenfull.enabled) {
             screenfull.on('change', function() {
-                $('.icon-fullscreen').toggleClass('active');
+                // Slight delay to stop icon state flickering during fullscreen transition
+                setTimeout(function () {
+                    $('.icon-fullscreen').toggleClass('active');
+                }, 250);
             });
         }