]> _ Git - fluidbook-html5.git/commitdiff
fix #1910 @0.5
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Mon, 29 Jan 2018 14:31:52 +0000 (15:31 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Mon, 29 Jan 2018 14:31:52 +0000 (15:31 +0100)
js/libs/fluidbook/fluidbook.nav.js

index 02f245e5316a84bd59dc850c3af7c0b1622a200c..b4bf0937be3837c0ce405af4a4eee3642ad88025 100644 (file)
@@ -436,7 +436,6 @@ FluidbookNav.prototype = {
                     navLinkTarget = ' target="_blank" rel="noopener noreferrer"';
                 }
 
-
                 if ($nav.find('#' + elementID).length > 0) {
                     continue;
                 }
@@ -445,9 +444,6 @@ FluidbookNav.prototype = {
                     if (this.fluidbook.datas.navExtraImage != '' && this.fluidbook.datas.navExtraLink != '') {
                         navExtraImage = this.fluidbook.datas.navExtraImage;
                         link = '<a id="' + elementID + '" data-tooltip="' + this.fluidbook.datas.navExtraTooltip + '" href="' + this.fluidbook.datas.navExtraLink + '"' + navLinkTarget + '><img class="nav-icon" src="data/images/' + navExtraImage + '"></a>';
-                    } else if (this.fluidbook.datas.afterSearch != '' && this.fluidbook.datas.afterSearchDisplayForHTML && this.fluidbook.datas.themeEnableAfterSearch && navType == 'horizontalNav') {
-                        // Use the "afterSearch" image and links set in the theme and link editor
-                        $nav.after('<div id="afterSearch"><div class="c">' + this.fluidbook.loader.getImage('data/images/' + this.fluidbook.datas.afterSearch) + '</div><div class="links">' + this.fluidbook.datas.links.aftersearch + '</div></li>');
                     }
                 } else if (navType == 'menu' && (this.fluidbook.datas.navExtraImage != '' || this.fluidbook.datas.navExtraImageMobile != '') && this.fluidbook.datas.navExtraLink != '') {
                     navExtraImage = this.fluidbook.datas.navExtraImageMobile || this.fluidbook.datas.navExtraImage; // Fallback to desktop image
@@ -579,6 +575,12 @@ FluidbookNav.prototype = {
 
         }
 
+        if (this.fluidbook.datas.afterSearch != '' && this.fluidbook.datas.afterSearchDisplayForHTML && this.fluidbook.datas.themeEnableAfterSearch && navType == 'horizontalNav') {
+            // Use the "afterSearch" image and links set in the theme and link editor
+            var afterSearchContent = '<div id="afterSearch"><div class="c">' + this.fluidbook.loader.getImage('data/images/' + this.fluidbook.datas.afterSearch) + '</div><div class="links">' + this.fluidbook.datas.links.aftersearch + '</div></li>';
+            console.log('insert ' + afterSearchContent);
+            $nav.after(afterSearchContent);
+        }
 
     },