aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflop25 <flop25@piwigo.org>2013-07-02 19:29:24 +0000
committerflop25 <flop25@piwigo.org>2013-07-02 19:29:24 +0000
commit251bbd5704ba25a0147b287103eb67f5e90e1734 (patch)
treeb064fe202cf1db80ed3a009b7da4b4d00ad04697
parent6814153630d944730c956427ee7709e8337e883d (diff)
bug:2848
The "More Info" link now works and redirects to the picture page git-svn-id: http://piwigo.org/svn/trunk@23745 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--themes/smartpocket/js/smartpocket.js22
-rw-r--r--themes/smartpocket/theme.css1
2 files changed, 15 insertions, 8 deletions
diff --git a/themes/smartpocket/js/smartpocket.js b/themes/smartpocket/js/smartpocket.js
index 629fe668c..9ee1027c4 100644
--- a/themes/smartpocket/js/smartpocket.js
+++ b/themes/smartpocket/js/smartpocket.js
@@ -1,26 +1,32 @@
(function(window, $, PhotoSwipe){
$(document).ready(function(){
+ var more_link
var options = {
jQueryMobile: true,
loop: var_loop,
captionAndToolbarAutoHideDelay: var_autohide,
imageScaleMethod: "fitNoUpscale",
getToolbar: function(){
-return '<div class="ps-toolbar-close"><div class="ps-toolbar-content"></div></div><div class="ps-toolbar-play"><div class="ps-toolbar-content"></div></div><a href="#" id="more_link">'+var_trad+'</a><div class="ps-toolbar-previous"><div class="ps-toolbar-content"></div></div><div class="ps-toolbar-next"><div class="ps-toolbar-content"></div></div>';},
+return '<div class="ps-toolbar-close"><div class="ps-toolbar-content"></div></div><div class="ps-toolbar-play"><div class="ps-toolbar-content"></div></div><div id="more_link">'+var_trad+'</div><div class="ps-toolbar-previous"><div class="ps-toolbar-content"></div></div><div class="ps-toolbar-next"><div class="ps-toolbar-content"></div></div>';},
getImageMetaData:function(el){
return {
picture_url: $(el).attr('data-picture-url')
};}
};
var myPhotoSwipe = $(".thumbnails a").photoSwipe(options);
- myPhotoSwipe.addEventHandler(PhotoSwipe.EventTypes.onDisplayImage, function(e){
+ // onShow - store a reference to our "more_link" button
+ myPhotoSwipe.addEventHandler(PhotoSwipe.EventTypes.onShow, function(e){
+ more_link = window.document.querySelectorAll('#more_link')[0];
+ });
+ // onToolbarTap - listen out for when the toolbar is tapped
+ myPhotoSwipe.addEventHandler(PhotoSwipe.EventTypes.onToolbarTap, function(e){
+ if (e.toolbarAction === PhotoSwipe.Toolbar.ToolbarAction.none){
+ if (e.tapTarget === more_link || Util.DOM.isChildOf(e.tapTarget, more_link)){
var currentImage = myPhotoSwipe.getCurrentImage();
- $("#more_link").attr("href", currentImage.metaData.picture_url);
- });
- $(document).bind('orientationchange', set_thumbnails_width);
- $("#more_link").click(function(){
- console.log($(this).attr('href'));
- });
+ window.location=currentImage.metaData.picture_url;
+ }
+ }
+}); $(document).bind('orientationchange', set_thumbnails_width);
set_thumbnails_width();
});
}(window, window.jQuery, window.Code.PhotoSwipe));
diff --git a/themes/smartpocket/theme.css b/themes/smartpocket/theme.css
index 4afe50723..75a26b387 100644
--- a/themes/smartpocket/theme.css
+++ b/themes/smartpocket/theme.css
@@ -27,6 +27,7 @@
font-size: 1.1em;
text-decoration: none;
vertical-align: middle;
+ cursor: pointer;
}
.ui-panel-inner > .ui-listview {
margin: -15px -15px 0;