From 2f4210e49e85e306d6b9dd81de4043609501f027 Mon Sep 17 00:00:00 2001 From: Bert Driehuis Date: Sun, 14 Sep 2014 23:06:43 +0200 Subject: [PATCH 1/4] Silence console warnings in Firefox by consistently returning a result from showImage, hideOverlay and showOverlay. --- assets/touchTouch/touchTouch.jquery.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/touchTouch/touchTouch.jquery.js b/assets/touchTouch/touchTouch.jquery.js index 16498e6..0ce6796 100644 --- a/assets/touchTouch/touchTouch.jquery.js +++ b/assets/touchTouch/touchTouch.jquery.js @@ -196,6 +196,7 @@ // Raise the visible flag overlayVisible = true; + return true; } function hideOverlay(){ @@ -214,6 +215,7 @@ //Reset possibly filtered items items = allitems; + return true; } function offsetSlider(index){ @@ -242,6 +244,7 @@ loadImage(items.eq(index).attr('href'), function(){ placeholders.eq(index).html(this); }); + return true; } // Load the image and execute a callback function. From 14e36b8b310ef63a88a76ad8efa5b28a16bb703e Mon Sep 17 00:00:00 2001 From: Bert Driehuis Date: Sun, 14 Sep 2014 23:10:29 +0200 Subject: [PATCH 2/4] Clean up whitespace (hard spaces introduced by an earlier pull request, it seems). --- assets/touchTouch/touchTouch.jquery.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/touchTouch/touchTouch.jquery.js b/assets/touchTouch/touchTouch.jquery.js index 0ce6796..19c7c71 100644 --- a/assets/touchTouch/touchTouch.jquery.js +++ b/assets/touchTouch/touchTouch.jquery.js @@ -120,9 +120,9 @@ //Filter to check if item has an ancestory with data-gallery attribute items = items.filter(function(){ - return $(this).parent().closest('[data-gallery]').length; + return $(this).parent().closest('[data-gallery]').length; - }); + }); } From bef516ad562432f4bdcfaca89a5f0656883db809 Mon Sep 17 00:00:00 2001 From: Bert Driehuis Date: Mon, 15 Sep 2014 22:24:26 +0200 Subject: [PATCH 3/4] Add an optional close button. Enable by overriding #closeButton{top} in your CSS. --- assets/touchTouch/arrows.png | Bin 1756 -> 1296 bytes assets/touchTouch/touchTouch.css | 13 +++++++++++-- assets/touchTouch/touchTouch.jquery.js | 7 +++++++ index.html | 4 ++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/assets/touchTouch/arrows.png b/assets/touchTouch/arrows.png index 73fc67f57642cc43edb5408a72a3cf7cc7920ff5..a90e284f31e2aad4467b4fe58d0dd94d22375a18 100644 GIT binary patch literal 1296 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 diff --git a/assets/touchTouch/touchTouch.css b/assets/touchTouch/touchTouch.css index 314919e..e21b55c 100644 --- a/assets/touchTouch/touchTouch.css +++ b/assets/touchTouch/touchTouch.css @@ -106,7 +106,7 @@ /* Arrows */ -#prevArrow,#nextArrow{ +#prevArrow,#nextArrow,#closeButton{ border:none; text-decoration:none; background:url('arrows.png') no-repeat; @@ -124,7 +124,7 @@ transition:opacity 0.2s ease; } -#prevArrow:hover, #nextArrow:hover{ +#prevArrow:hover, #nextArrow:hover, #closeButton:hover{ opacity:1; } @@ -137,3 +137,12 @@ background-position:right top; right:40px; } + +/* Enable the close button by overriding #closeButton{top:NNNpx;} in your css. Try + * 100px as a first guess if you're not sure where to position the close button. + */ +#closeButton{ + background-position:-43px 0px; + top:-1000px; + right:40px; +} diff --git a/assets/touchTouch/touchTouch.jquery.js b/assets/touchTouch/touchTouch.jquery.js index 19c7c71..1c07c50 100644 --- a/assets/touchTouch/touchTouch.jquery.js +++ b/assets/touchTouch/touchTouch.jquery.js @@ -15,6 +15,7 @@ slider = $('
'), prevArrow = $(''), nextArrow = $(''), + closeButton = $(''), // optional, enable in CSS. overlayVisible = false; @@ -154,6 +155,12 @@ e.preventDefault(); showNext(); }); + + overlay.append(closeButton); + closeButton.click(function(e){ + e.preventDefault(); + hideOverlay(); + }); } // Listen for arrow keys diff --git a/index.html b/index.html index 1e73798..ba44995 100644 --- a/index.html +++ b/index.html @@ -11,6 +11,10 @@ + + + + From b826fe77692b921da3617ab7df955b793ce66100 Mon Sep 17 00:00:00 2001 From: Bert Driehuis Date: Mon, 15 Sep 2014 22:45:20 +0200 Subject: [PATCH 4/4] Get the pixel positions of the close button just right. --- assets/touchTouch/arrows.png | Bin 1296 -> 1295 bytes assets/touchTouch/touchTouch.css | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/touchTouch/arrows.png b/assets/touchTouch/arrows.png index a90e284f31e2aad4467b4fe58d0dd94d22375a18..fad21a3e3f157d7263709d8deebf2ae1be420ee4 100644 GIT binary patch delta 1214 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 diff --git a/assets/touchTouch/touchTouch.css b/assets/touchTouch/touchTouch.css index e21b55c..efe4cda 100644 --- a/assets/touchTouch/touchTouch.css +++ b/assets/touchTouch/touchTouch.css @@ -144,5 +144,5 @@ #closeButton{ background-position:-43px 0px; top:-1000px; - right:40px; + right:43px; }