From 1511100921fb1b6951406ca56e205dd51acb4147 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 16 Jul 2020 20:25:35 +0200
Subject: [PATCH] fix #3791 @0.5

---
 _index.html                              | 2 +-
 js/libs/fluidbook/fluidbook.bookmarks.js | 8 ++++----
 js/libs/fluidbook/fluidbook.menu.js      | 9 ++++-----
 js/libs/fluidbook/fluidbook.nav.js       | 2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/_index.html b/_index.html
index fc6cb136..be72ec2e 100644
--- a/_index.html
+++ b/_index.html
@@ -102,7 +102,7 @@
 </div>
 <div id="searchHints"></div>
 <div id="viewOverlay" aria-hidden="true"></div>
-<div id="view" aria-hidden="true"></div>
+<div id="view" aria-hidden="true" aria-live="polite"></div>
 <div id="innerView" aria-hidden="true"></div>
 <div id="pagesContents" aria-hidden="true"><!-- $pagesContents --></div>
 <div id="op" aria-hidden="true"></div>
diff --git a/js/libs/fluidbook/fluidbook.bookmarks.js b/js/libs/fluidbook/fluidbook.bookmarks.js
index 9fadbe5e..1206d671 100644
--- a/js/libs/fluidbook/fluidbook.bookmarks.js
+++ b/js/libs/fluidbook/fluidbook.bookmarks.js
@@ -489,7 +489,7 @@ FluidbookBookmarks.prototype = {
                 var dim = this.fluidbook.menu.index.getThumbDimensions(group.page);
 
                 index += '<div class="doubleThumb simple left"' + dim.doublethumb + ' page="' + group.page + '" data-pages="' + pages.join(',') + '">';
-                index += '<div class="thumb left"' + dim.thumb + '><a href="#/page/' + group.page + '">' + this.fluidbook.loader.getThumbImage(group.page) + '</a><span class="number"' + dim.pagenumber + '>' + group.name + '</span>';
+                index += this.fluidbook.menu.index._thumb(group.page, 'left', 100);
                 if (this.fluidbook.bookmarks.enabled) {
                     index += this.fluidbook.bookmarks.getBookmarkForPage(group.page, true, true);
                 }
@@ -510,7 +510,7 @@ FluidbookBookmarks.prototype = {
                 var dim = this.fluidbook.menu.index.getThumbDimensions(p);
 
                 index += '<div class="doubleThumb simple left"' + dim.doublethumb + ' page="' + p + '" data-pages="' + p + '">';
-                index += '<div class="thumb left"' + dim.thumb + '><a href="#/page/' + p + '">' + this.fluidbook.loader.getThumbImage(p) + '</a><span class="number"' + dim.pagenumber + '>' + this.fluidbook.physicalToVirtual(p) + '</span>';
+                index += this.fluidbook.menu.index._thumb(p, 'left', 100);
                 if (this.fluidbook.bookmarks.enabled) {
                     index += this.fluidbook.bookmarks.getBookmarkForPage(p, true, true);
                 }
@@ -521,12 +521,12 @@ FluidbookBookmarks.prototype = {
         index += '</div></div>';
         index += '<div class="fonctions">';
         if (this.fluidbook.settings.friend && this.fluidbook.settings.bookmarkSendEnable) {
-            index += '<a class="send" href="#">' + this.fluidbook.l10n.__('send') + '</a>';
+            index += '<a role="button" aria-label="'+this.fluidbook.l10n.__('send')+'" class="send" href="#">' + this.fluidbook.l10n.__('send') + '</a>';
 
         }
         if (this.fluidbook.settings.print || this.fluidbook.settings.pdf) {
             // ToDo: differentiate between download & print?
-            index += '<a class="download" href="#">' + downloadLabel + '</a>';
+            index += '<a role="button" aria-label="' + downloadLabel + '" class="download" href="#">' + downloadLabel + '</a>';
         }
         index += '</div>';
         index += '</div>';
diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js
index 41b58704..87755cfe 100644
--- a/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@ -441,17 +441,16 @@ FluidbookMenu.prototype = {
         } catch (e) {
 
         }
-        if (title == undefined) {
+        if (title === undefined) {
             title = '';
         }
-        if (downloadLabel == undefined) {
+        if (downloadLabel === undefined) {
             downloadLabel = '';
         }
 
-        var view = this.fluidbook.bookmarks.getView(title, downloadLabel);
-        this.viewWrap(view, 'bookmarks');
+        this.viewWrap(this.fluidbook.bookmarks.getView(title, downloadLabel), 'bookmarks');
 
-        if (callback != undefined) {
+        if (callback !== undefined) {
             callback();
         }
     },
diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index f3f84737..37b659be 100644
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -732,7 +732,7 @@ FluidbookNav.prototype = {
 
         // Bookmarks icon
         $(document).on('click', '.icon-bookmarks', function () {
-            if ($(this).data('extra') !== null) {
+            if ($(this).data('extra') !== null && $(this).data('extra') !== undefined) {
                 $this.fluidbook.menu.openView('bookmark', $(this).data('extra'), null, function () {
                 });
                 return false;
-- 
2.39.5