]> _ Git - fluidbook-html5.git/commitdiff
wait #5099 @0.5
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 16 Feb 2022 08:48:00 +0000 (09:48 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 16 Feb 2022 08:48:00 +0000 (09:48 +0100)
js/libs/fluidbook/fluidbook.bookmarks.js
js/libs/fluidbook/menu/fluidbook.index.js

index 0c90466ca012a46fb9272f2e32c09cb1b416a239..dd35948b16f62933f1853dd86e21a31133908f7c 100644 (file)
@@ -445,7 +445,6 @@ FluidbookBookmarks.prototype = {
 
 
         var index = '<div class="' + contentClass + '"><div class="indexView bookmarkView" data-size="' + this.fluidbook.settings.bookmarkView + '">';
-
         if (this.fluidbook.settings.bookmarkView === 'small') {
             index += '<div class="indexViewHolder">';
             if (onlyGroup === undefined || !onlyGroup) {
@@ -464,7 +463,6 @@ FluidbookBookmarks.prototype = {
                         index += this.fluidbook.bookmarks.getBookmarkForPage(group.page, true, true);
                     }
                     index += '</div>';
-                    index += '</div>';
                 }
             } else {
                 var group = groups[this.getGroupOfPage(onlyGroup)];
@@ -485,25 +483,23 @@ FluidbookBookmarks.prototype = {
                         index += this.fluidbook.bookmarks.getBookmarkForPage(p, true, true);
                     }
                     index += '</div>';
-                    index += '</div>';
+
                 }
             }
             index += '</div>';
         } else if (this.fluidbook.settings.bookmarkView === 'large') {
             index += this.fluidbook.menu.index.getPages();
         }
-        index += '</div>';
+        index += '</div></div>';
         index += '<div class="fonctions">';
         if (this.fluidbook.settings.friend && this.fluidbook.settings.bookmarkSendEnable) {
             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 role="button" aria-label="' + downloadLabel + '" class="download" href="#">' + downloadLabel + '</a>';
         }
         index += '</div>';
-        index += '</div>';
         return index;
     },
 
index c8497ff6d15cb44e46865ab0b0d20035fde2e349..ebe4ab8cf993e7e2609979b9731bc76e05d26924 100644 (file)
@@ -100,6 +100,7 @@ FluidbookIndex.prototype = {
         }
 
         res += this.getPages(height, pageLinks, bookmarks, mobileFirst);
+        res += '</div></div>';
         return res;
     },
 
@@ -130,7 +131,7 @@ FluidbookIndex.prototype = {
         for (var i = start; i <= this.fluidbook.contentlock.getMaxPage(); i += increment) {
             res += this.getPage(i, this.singleMode, height, pageLinks, bookmarks, mobileFirst, '');
         }
-        res += '</nav></div></div>';
+        res += '</nav>';
         return res;
     },