From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 16 Aug 2013 15:25:32 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=ee3484f0514d6f4f1e742de5f9d5807d396757ee;p=fluidbook-html5.git

---

diff --git a/js/libs/fluidbook/fluidbook.help.js b/js/libs/fluidbook/fluidbook.help.js
index 07c2cc38..f7f852bf 100644
--- a/js/libs/fluidbook/fluidbook.help.js
+++ b/js/libs/fluidbook/fluidbook.help.js
@@ -101,18 +101,21 @@ FluidbookHelp.prototype = {
 			});
 		} else {
 			$("#help").click(function() {
-				$this.toggle();
+				$this.show();
 				return false;
 			});
 		}
 	},
+	isVisible: function() {
+		return this.view.is(":visible");
+	},
 	show: function(time) {
 		this.clearTimeout();
 		if (time == undefined) {
 			time = 0;
 		}
 
-		if (this.view.is(":visible")) {
+		if (this.isVisible()) {
 			return false;
 		}
 
@@ -125,8 +128,13 @@ FluidbookHelp.prototype = {
 		this.view.show();
 		this.fluidbook.showAllButtons();
 		if (this.fluidbook.support.isMobile) {
-			$(document).one('click touchend', function() {
+			$(document).one('click t', function(e) {
+				e.stopImmediatePropagation();
+				e.stopPropagation();
+				e.preventDefault();
+
 				$this.hide();
+				return false;
 			});
 		} else {
 			if (time != 0) {
@@ -140,7 +148,7 @@ FluidbookHelp.prototype = {
 	hide: function() {
 		this.clearTimeout();
 		var $this = this;
-		if (this.view.is(':visible')) {
+		if (this.isVisible()) {
 			this.view.hide();
 			this.fluidbook.hideUnnecessaryButtons();
 			if (this.fluidbook.support.isMobile) {
@@ -152,7 +160,7 @@ FluidbookHelp.prototype = {
 		return false;
 	},
 	toggle: function() {
-		if (this.view.is(':visible')) {
+		if (this.isVisible()) {
 			this.hide();
 		} else {
 			this.show();
diff --git a/js/libs/fluidbook/fluidbook.pad.js b/js/libs/fluidbook/fluidbook.pad.js
index ac134ba0..0474704f 100644
--- a/js/libs/fluidbook/fluidbook.pad.js
+++ b/js/libs/fluidbook/fluidbook.pad.js
@@ -18,6 +18,9 @@ FluidbookPad.prototype = {
 	initEvents: function() {
 		var $this = this;
 		$(document).on('click', '#down', function() {
+			if ($this.fluidbook.help.isVisible()) {
+				return;
+			}
 			if ($(this).hasClass('right')) {
 				$this.fluidbook.goNextChapter();
 			} else {
diff --git a/js/libs/fluidbook/fluidbook.touch.js b/js/libs/fluidbook/fluidbook.touch.js
index 61404284..0d5372f4 100644
--- a/js/libs/fluidbook/fluidbook.touch.js
+++ b/js/libs/fluidbook/fluidbook.touch.js
@@ -53,10 +53,10 @@ FluidbookTouch.prototype = {
 		return this._move(e.screenX, e.screenY);
 	},
 	allowMove: function() {
-		return !(this.fluidbook.support.getZoomLevel() <= 1 && !this.fluidbook.viewMode());
+		return !(this.fluidbook.support.getZoomLevel() <= 1  && !this.fluidbook.viewMode());
 	},
 	allowSlide: function() {
-		return !(this.gesturing || this.fluidbook.support.getZoomLevel() > 1 || this.fluidbook.viewMode());
+		return !(this.gesturing || this.fluidbook.support.getZoomLevel() > 1 || this.fluidbook.viewMode() || this.fluidbook.help.isVisible());
 	},
 	reset: function() {
 		this.startX = 0;
diff --git a/js/main.js b/js/main.js
index dbe8ea35..1bab2dc1 100644
--- a/js/main.js
+++ b/js/main.js
@@ -11,7 +11,7 @@ var gal = null;
 
 $(function() {
 	FastClick.attach(document.body);
-	
+
 	$_GET = parseGet();
 	INITED = false;
 
@@ -253,7 +253,11 @@ function resize(init) {
 }
 
 function goNextPage(e) {
+	if (fluidbook.help.isVisible()) {
+		return;
+	}
 	var y = e.offsetY == undefined ? e.originalEvent.layerY : e.offsetY;
+
 	if (y < 65) {
 		if (fluidbook.pad.enabled) {
 			fluidbook.goNextChapter();
@@ -267,6 +271,9 @@ function goNextPage(e) {
 }
 
 function goPreviousPage(e) {
+	if (fluidbook.help.isVisible()) {
+		return;
+	}
 	var y = e.offsetY == undefined ? e.originalEvent.layerY : e.offsetY;
 	if (y < 65) {
 		if (fluidbook.pad.enabled) {