From: Stephen Cameron <stephen@cubedesigners.com>
Date: Thu, 21 Sep 2017 10:23:30 +0000 (+0200)
Subject: Done #1678 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b3e172ccf0363b9500661a6fbef5b729f776fe7a;p=fluidbook-html5.git

Done #1678 @0.5
---

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