From e57d5c4416936ff3fa94383ad712420caf0ac14c Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Thu, 31 Jan 2013 19:13:06 +0400
Subject: [PATCH] some odd behavior on touchSwipe click events...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 editor.html | 2 +-
 index.html  | 7 ++++---
 magazine.js | 6 +-----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/editor.html b/editor.html
index e5db370..da3e774 100755
--- a/editor.html
+++ b/editor.html
@@ -98,7 +98,7 @@ $(document).ready(function(){
 			click: function(evt, elem){
 				if($(elem).hasClass('page')){
 					setCurrentPage(elem)
-				} else if($(elem).hasClass('content')){
+				} else if($(elem).parents('.page').length != 0){
 					setCurrentPage($(elem).parents('.page').first())
 				}
 				return true
diff --git a/index.html b/index.html
index 2ea8df6..776c797 100755
--- a/index.html
+++ b/index.html
@@ -86,18 +86,19 @@ $(document).ready(function(){
 				}
 			},
 
-
 			// XXX for some reason this deos not bubble up the nested elements...
+			// XXX just stopped working....
+			//		...works if we double click but not on a single click...
 			click: function(evt, elem){
 				if($(elem).hasClass('page')){
 					setCurrentPage(elem)
-				} else if($(elem).hasClass('content')){
+				} else if($(elem).parents('.page').length != 0){
 					setCurrentPage($(elem).parents('.page').first())
 				}
 				return true
 			},
 
-			excludedElements: '.noSwipe, a, [contenteditable=true]',
+			excludedElements: $.fn.swipe.defaults.excludedElements + ', [contenteditable=true]',
 			fingers: $.fn.swipe.fingers.ALL
 			//fingers: $.fn.swipe.fingers.THREE
 		})
diff --git a/magazine.js b/magazine.js
index ef98365..2ed15c7 100755
--- a/magazine.js
+++ b/magazine.js
@@ -508,11 +508,6 @@ function toggleBookmark(n){
 			.attr({
 				title: 'Toggle bookmark (B)'
 			})
-			.swipe({
-				click: function(){
-					toggleBookmark(cur)
-				}
-			})
 
 		$('.viewer').trigger('bookmarkAdded', n)
 
@@ -1004,6 +999,7 @@ function createCoverPage(template){
 
 /************************************************ editor: magazine ***/
 
+
 // XXX setup event handlers...
 function loadMagazine(mag, position, bookmarks){
 	removeMagazine()