From: Stephen Cameron <stephen@cubedesigners.com>
Date: Tue, 19 Sep 2017 13:54:27 +0000 (+0200)
Subject: Merge branch 'master' into burgermenu
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=35c6c8b47fb7f0e5059928128748d8514c8b0b3b;p=fluidbook-html5.git

Merge branch 'master' into burgermenu
---

35c6c8b47fb7f0e5059928128748d8514c8b0b3b
diff --cc js/libs/fluidbook/fluidbook.nav.js
index 6f47acf3,d0edb279..bae9e671
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@@ -269,15 -90,10 +269,15 @@@ FluidbookNav.prototype = 
              hide.push('chapters');
          }
  
 +        // If the locales icon is included, it should always be placed last in the list for formatting reasons
 +        // if ((localeIconIndex = loop.indexOf('lang')) !== -1) {
 +        //     loop.push(loop.splice(localeIconIndex, 1)[0]); // Push to end of array
 +        // }
 +
          for (var e in loop) {
              var icon = loop[e];
 -            var visible = hide.indexOf(icon) == -1;
 +            //var visible = hide.indexOf(icon) == -1;
-             var link;
+             var link = null;
  
              if (icon == 'home' && !skipHome) {