fix #2199 @1.5

diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index 41fef7945cc94471ec19983afa4fa6d83fd59315..69f9edadffa8f02230e5c5fb4ec1cedd182808b9 100644 (file)
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -652,7 +652,6 @@ FluidbookNav.prototype = {
         // Search icon in horizontal menu
         $(document).on('click', '#horizontalNav_searchIcon', function (event) {
             event.preventDefault()
-
             $this.openSearch();
         });
 
@@ -666,9 +665,15 @@ FluidbookNav.prototype = {
         // Toggle icon on fullscreen change (also handles exiting via ESC key)
         if (screenfull.enabled) {
             screenfull.on('change', function () {
+                resize();
                 // Slight delay to stop icon state flickering during fullscreen transition
                 setTimeout(function () {
-                    $('.icon-fullscreen').toggleClass('active');
+                    if (screenfull.isFullscreen) {
+                        $('.icon-fullscreen').addClass('active');
+                    } else {
+                        $('.icon-fullscreen').removeClass('active');
+                    }
+                    resize();
                 }, 250);
             });
         }
@@ -740,7 +745,6 @@ FluidbookNav.prototype = {
 
         // Click handler to close menu
         $(document).on('click', '#' + buttonID, function (e) {
-
             e.preventDefault();
 
             // If the search is active, the close button should clear the search
@@ -748,7 +752,6 @@ FluidbookNav.prototype = {
             if ($this.fluidbook.search.isSearchActive()) {
                 $this.fluidbook.search.closeSearch();
             } else {
-
                 // If we're closing the menu but the search was open and nothing
                 // was searched for, we need to reset the menu...
                 var sHints = $this.fluidbook.search.menuSearchHints,
@@ -761,8 +764,6 @@ FluidbookNav.prototype = {
 
                 $this.menuAPI.close();
             }
-
-
         });
 
         return '<a href="#" id="' + buttonID + '">' + getSpriteIcon('interface-close') + '</a>';

diff --git a/js/libs/screenfull.min.js b/js/libs/screenfull.min.js
index d02dc8179e49fcc81c509d17533c32d888b2afde..750c465da76b302dee79f2ec23343980bfdce2eb 100644 (file)
--- a/js/libs/screenfull.min.js
+++ b/js/libs/screenfull.min.js
@@ -1,7 +1,7 @@
 /*!
 * screenfull
-* v3.3.1 - 2017-07-07
+* v3.3.2 - 2017-10-27
 * (c) Sindre Sorhus; MIT License
 */
 
-!function(){"use strict";var a="undefined"!=typeof window&&void 0!==window.document?window.document:{},b="undefined"!=typeof module&&module.exports,c="undefined"!=typeof Element&&"ALLOW_KEYBOARD_INPUT"in Element,d=function(){for(var b,c=[["requestFullscreen","exitFullscreen","fullscreenElement","fullscreenEnabled","fullscreenchange","fullscreenerror"],["webkitRequestFullscreen","webkitExitFullscreen","webkitFullscreenElement","webkitFullscreenEnabled","webkitfullscreenchange","webkitfullscreenerror"],["webkitRequestFullScreen","webkitCancelFullScreen","webkitCurrentFullScreenElement","webkitCancelFullScreen","webkitfullscreenchange","webkitfullscreenerror"],["mozRequestFullScreen","mozCancelFullScreen","mozFullScreenElement","mozFullScreenEnabled","mozfullscreenchange","mozfullscreenerror"],["msRequestFullscreen","msExitFullscreen","msFullscreenElement","msFullscreenEnabled","MSFullscreenChange","MSFullscreenError"]],d=0,e=c.length,f={};d<e;d++)if((b=c[d])&&b[1]in a){for(d=0;d<b.length;d++)f[c[0][d]]=b[d];return f}return!1}(),e={change:d.fullscreenchange,error:d.fullscreenerror},f={request:function(b){var e=d.requestFullscreen;b=b||a.documentElement,/5\.1[.\d]* Safari/.test(navigator.userAgent)?b[e]():b[e](c&&Element.ALLOW_KEYBOARD_INPUT)},exit:function(){a[d.exitFullscreen]()},toggle:function(a){this.isFullscreen?this.exit():this.request(a)},onchange:function(a){this.on("change",a)},onerror:function(a){this.on("error",a)},on:function(b,c){var d=e[b];d&&a.addEventListener(d,c,!1)},off:function(b,c){var d=e[b];d&&a.removeEventListener(d,c,!1)},raw:d};if(!d)return void(b?module.exports=!1:window.screenfull=!1);Object.defineProperties(f,{isFullscreen:{get:function(){return Boolean(a[d.fullscreenElement])}},element:{enumerable:!0,get:function(){return a[d.fullscreenElement]}},enabled:{enumerable:!0,get:function(){return Boolean(a[d.fullscreenEnabled])}}}),b?module.exports=f:window.screenfull=f}();
\ No newline at end of file
+!function(){"use strict";var a="undefined"!=typeof window&&void 0!==window.document?window.document:{},b="undefined"!=typeof module&&module.exports,c="undefined"!=typeof Element&&"ALLOW_KEYBOARD_INPUT"in Element,d=function(){for(var b,c=[["requestFullscreen","exitFullscreen","fullscreenElement","fullscreenEnabled","fullscreenchange","fullscreenerror"],["webkitRequestFullscreen","webkitExitFullscreen","webkitFullscreenElement","webkitFullscreenEnabled","webkitfullscreenchange","webkitfullscreenerror"],["webkitRequestFullScreen","webkitCancelFullScreen","webkitCurrentFullScreenElement","webkitCancelFullScreen","webkitfullscreenchange","webkitfullscreenerror"],["mozRequestFullScreen","mozCancelFullScreen","mozFullScreenElement","mozFullScreenEnabled","mozfullscreenchange","mozfullscreenerror"],["msRequestFullscreen","msExitFullscreen","msFullscreenElement","msFullscreenEnabled","MSFullscreenChange","MSFullscreenError"]],d=0,e=c.length,f={};d<e;d++)if((b=c[d])&&b[1]in a){for(d=0;d<b.length;d++)f[c[0][d]]=b[d];return f}return!1}(),e={change:d.fullscreenchange,error:d.fullscreenerror},f={request:function(b){var e=d.requestFullscreen;b=b||a.documentElement,/ Version\/5\.1(?:\.\d+)? Safari\//.test(navigator.userAgent)?b[e]():b[e](c&&Element.ALLOW_KEYBOARD_INPUT)},exit:function(){a[d.exitFullscreen]()},toggle:function(a){this.isFullscreen?this.exit():this.request(a)},onchange:function(a){this.on("change",a)},onerror:function(a){this.on("error",a)},on:function(b,c){var d=e[b];d&&a.addEventListener(d,c,!1)},off:function(b,c){var d=e[b];d&&a.removeEventListener(d,c,!1)},raw:d};if(!d)return void(b?module.exports=!1:window.screenfull=!1);Object.defineProperties(f,{isFullscreen:{get:function(){return Boolean(a[d.fullscreenElement])}},element:{enumerable:!0,get:function(){return a[d.fullscreenElement]}},enabled:{enumerable:!0,get:function(){return Boolean(a[d.fullscreenEnabled])}}}),b?module.exports=f:window.screenfull=f}();
\ No newline at end of file