Done #1678 @0.5

diff --git a/js/libs/fluidbook/fluidbook.help.js b/js/libs/fluidbook/fluidbook.help.js
index 5f8acfb35ccd88bb006e9a077eff4b4300bde708..52574b4f606a2bc80fb94aa47e10355e42e451eb 100644 (file)
--- a/js/libs/fluidbook/fluidbook.help.js
+++ b/js/libs/fluidbook/fluidbook.help.js
@@ -42,16 +42,16 @@ FluidbookHelp.prototype = {
 \r
                // Icons\r
                help += '<div id="icons">';\r
-               var scale = $("#nav").transform('scaleX');\r
-               $("#nav").transform({\r
-                       scale: [1, 1]\r
-               }, {\r
-                       preserve: true\r
-               });\r
-               var h = 40 + ($("#nav a[data-tooltip]").length - 1) * 25;\r
+               // var scale = $("#horizontalNav").transform('scaleX');\r
+               // $("#horizontalNav").transform({\r
+               //      scale: [1, 1]\r
+               // }, {\r
+               //      preserve: true\r
+               // });\r
+               var h = 40 + ($("#horizontalNav a[data-tooltip]").length - 1) * 25;\r
                var ww = $(window).width();\r
 \r
-               $("#nav a[data-tooltip]").each(function() {\r
+               $("#horizontalNav a[data-tooltip]").each(function() {\r
                        var text = $(this).data('tooltip');\r
                        if (text == null || text == undefined || text == '' || $(this).hasClass('hidden')) {\r
                                return;\r
@@ -72,11 +72,11 @@ FluidbookHelp.prototype = {
                        help += '<div class="icon ' + c + '" style="padding-top:' + h + 'px;left:' + left + 'px;"><span>' + text + '</span></div>';\r
                        h -= 25;\r
                });\r
-               $("#nav").transform({\r
-                       scale: [scale, scale]\r
-               }, {\r
-                       preserve: true\r
-               });\r
+               // $("#horizontalNav").transform({\r
+               //      scale: [scale, scale]\r
+               // }, {\r
+               //      preserve: true\r
+               // });\r
                help += '</div>';\r
 \r
                // Interface\r

diff --git a/js/libs/fluidbook/fluidbook.zoom.js b/js/libs/fluidbook/fluidbook.zoom.js
index 3e59c94c9ac8616215bc3b2bf7f4a0c7fafc4cb7..64833d6432d9d29b529a6c1875afed8501e88487 100644 (file)
--- a/js/libs/fluidbook/fluidbook.zoom.js
+++ b/js/libs/fluidbook/fluidbook.zoom.js
@@ -163,6 +163,9 @@ FluidbookZoom.prototype = {
         var hiddenElements = $("header,footer,#interface,#links a.bookmark");
 
         if (this.zoom != 1) {
+
+            this.fluidbook.help.hide(); // Hide the help view if it's showing
+
             if (!$('header').hasClass('hidden')) {
                 $(hiddenElements).addClass('hidden');
                 this.hideInterfaceTimeout = setTimeout(function () {