wait #4607 @0.5

diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index 48ce3dbfcfed520212a54188f93f60d8efeea1ee..db007083eb944f8474f0e8ad25520929a2e7bf48 100644 (file)
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -606,20 +606,25 @@ FluidbookNav.prototype = {
                 // Process link ID from editor
                 if (extraURL.indexOf('link:') === 0) {
                     var linkId = extraURL.split(':', 2)[1];
-                    var foundLink;
-                    $.each(this.fluidbook.settings.links, function (page, links) {
-                        var l = $('<root>' + links + '</root>').find('[data-id="' + linkId + '"]');
+                    var foundLink='';
+                    $.each(this.fluidbook.settings.links, function (page, plinks) {
+                        var allLinks = '';
+                        $.each(plinks, function (blendmode, links) {
+                            allLinks += links.join('');
+                        });
+                        var l = $('<root>' + allLinks + '</root>').find('[data-id="' + linkId + '"]');
                         if (l.length === 1) {
                             foundLink = l;
                             return false;
                         }
                     });
-                    if (foundLink === undefined) {
-                        continue;
+
+                    if(foundLink===''){
+                        return;
                     }
+
                     link = $(foundLink).find('a').append(linkIcon);
                     if (navType === 'menu' && extraType === 'icon') {
-                        var tooltip = $(link).data('tooltip');
                         $(link).append('<span class="menu-item-title">' + $(link).data('tooltip') + '</span>');
                     }
 
@@ -628,6 +633,7 @@ FluidbookNav.prototype = {
                     // Normal link
                     link = '<a href="' + extraURL + '" target="_blank" rel="noopener">' + linkIcon + '</a>';
                 }
+
                 var nav = this.getNavFromType(navType);
                 nav.find('ul').append('<li>' + link + '</li>');
             }

diff --git a/style/fluidbook.less b/style/fluidbook.less
index 95db44d3c345e3447b7378d1cdad236a5bf7bfa6..a7d6e183bf4579dba470f5f7b9accea182599f91 100644 (file)
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -792,7 +792,6 @@ body, html {
   z-index: 11;
   direction: ltr;
 
-  s
   &.animate {
     transition: all @zoomtransition ease-out;
   }