diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index 32f9ed0..a6ba9b7 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,6 +1,15 @@ Changelog ========= +11.1 - (2019-03-25) +--------------------- +* Bug fix: fixed jquery.galleryview behavior when more than 1 gallery is added + and javascript is loaded on the bottom + [ichim-david refs #104101] +* Change: modified jquery.galleryview to add gallery-panel instead of panel class + thus avoiding clash with other javascripts that are using panel logic + [ichim-david refs #104101] + 11.0 - (2019-01-28) --------------------- * Jenkins: Add sonarqube step diff --git a/eea/jquery/plugins/galleryview/CHANGELOG.txt b/eea/jquery/plugins/galleryview/CHANGELOG.txt index 74752c7..fb91b6d 100644 --- a/eea/jquery/plugins/galleryview/CHANGELOG.txt +++ b/eea/jquery/plugins/galleryview/CHANGELOG.txt @@ -2,6 +2,12 @@ GalleryView - jQuery Content Gallery Plugin Author: Jack Anderson Documentation: http://www.spaceforaname.com/galleryview/ +Version 2.0.2 - 2019-03-22 +-------------------------- +- removed onLoad buildGallery as moving the js to the bottom can + end up calling the buildGallery more than once +- renamed panel to gallery-panel as panel can interfere with other + javascript Version 2.0.1 - 2013-05-28 -------------------------- diff --git a/eea/jquery/plugins/galleryview/galleryview.css b/eea/jquery/plugins/galleryview/galleryview.css index 5265675..82742fd 100644 --- a/eea/jquery/plugins/galleryview/galleryview.css +++ b/eea/jquery/plugins/galleryview/galleryview.css @@ -7,7 +7,7 @@ To create additional rules, use the markup below as a guide to GalleryView's architecture.
-
+
...overlay content... @@ -40,14 +40,14 @@ .loader { background: url(../../++resource++galleryview/loader.gif) center center no-repeat white; } /* GALLERY PANELS */ -.gallery .panel { +.gallery .gallery-panel { background: black; } /* DEFINE HEIGHT OF PANEL OVERLAY */ /* NOTE - It is best to define padding here as well so overlay and background retain identical dimensions */ .gallery .panel-overlay, -.gallery .panel .overlay-background { +.gallery .gallery-panel .overlay-background { min-height: 60px; padding: 1em; display: block; @@ -58,11 +58,11 @@ } /* PANEL OVERLAY BACKGROUND */ -.gallery .panel .overlay-background { background: #222; } +.gallery .gallery-panel .overlay-background { background: #222; } /* PANEL OVERLAY CONTENT */ -.gallery .panel .panel-overlay { color: white; font-size: 13px; } -.gallery .panel .panel-overlay a { color: white; text-decoration: underline; font-weight: bold; } +.gallery .gallery-panel .panel-overlay { color: white; font-size: 13px; } +.gallery .gallery-panel .panel-overlay a { color: white; text-decoration: underline; font-weight: bold; } /* FILMSTRIP */ /* 'margin' will define top/bottom margin in completed gallery */ @@ -77,6 +77,11 @@ /* WRAPPER FOR CURRENT FILMSTRIP IMAGE */ .frame.current .img_wrap { border-color: #000; } +/* 104101 thumbnail image is inside the border area when left is 0 */ +.img_wrap > img { + left: 0 !important; +} + /* FRAME IMAGES */ .frame img { border: none; } diff --git a/eea/jquery/plugins/galleryview/jquery.galleryview-2.0.js b/eea/jquery/plugins/galleryview/jquery.galleryview-2.0.js index 9eb5565..7743842 100644 --- a/eea/jquery/plugins/galleryview/jquery.galleryview-2.0.js +++ b/eea/jquery/plugins/galleryview/jquery.galleryview-2.0.js @@ -72,6 +72,7 @@ var window_loaded = false; //Transition from current item to item 'i' function showItem(i) { //Disable next/prev buttons until transition is complete + var show_filmstrip = j_gallery.find('.strip_wrapper').length; if(opts.hover_nav_buttons_images) { $('.nav-next-overlay',j_gallery).unbind('click'); $('.nav-prev-overlay',j_gallery).unbind('click'); @@ -81,7 +82,7 @@ var window_loaded = false; j_frames.unbind('click'); //Fade out all frames while fading in target frame - if(opts.show_filmstrip) { + if(show_filmstrip) { j_frames.removeClass('current').find('img').stop().animate({ 'opacity':opts.frame_opacity },opts.transition_speed); @@ -93,7 +94,7 @@ var window_loaded = false; //If the gallery has panels and the panels should fade, fade out all panels while fading in target panel if(opts.show_panels && opts.fade_panels) { j_panels.fadeOut(opts.transition_speed).eq(i%item_count).fadeIn(opts.transition_speed,function(){ - if(!opts.show_filmstrip) { + if(!show_filmstrip) { if(opts.hover_nav_buttons_images) { $('.nav-prev-overlay',j_gallery).click(showPrevItem); $('.nav-next-overlay',j_gallery).click(showNextItem); @@ -105,7 +106,7 @@ var window_loaded = false; } //If gallery has a filmstrip, handle animation of frames - if(opts.show_filmstrip) { + if(show_filmstrip) { //Slide either pointer or filmstrip, depending on transition method if(slide_method=='strip') { //Stop filmstrip if it's currently in motion @@ -415,7 +416,7 @@ var window_loaded = false; $('.overlay-background',j_panels).css('bottom',0); } - $('.panel iframe',j_panels).css({ + $('.gallery-panel iframe',j_panels).css({ 'width':opts.panel_width+'px', 'height':opts.panel_height+'px', 'border':'0' @@ -800,10 +801,10 @@ var window_loaded = false; if(opts.show_panels) { for(i=j_frames.length-1;i>=0;i--) { if(j_frames.eq(i).find('.panel-content').length>0) { - j_frames.eq(i).find('.panel-content').remove().prependTo(j_gallery).addClass('panel'); + j_frames.eq(i).find('.panel-content').remove().prependTo(j_gallery).addClass('gallery-panel'); } else { p = $('
'); - p.addClass('panel'); + p.addClass('gallery-panel'); im = $(''); im.attr('src',j_frames.eq(i).find('img').eq(0).attr('src')).appendTo(p); p.prependTo(j_gallery); @@ -830,7 +831,7 @@ var window_loaded = false; j_frame_img_wrappers = $('.img_wrap',j_frames); } - j_panels = $('.panel',j_gallery); + j_panels = $('.gallery-panel',j_gallery); if(!opts.show_panels) { opts.panel_height = 0; @@ -924,15 +925,7 @@ var window_loaded = false; 'height':gallery_height+(filmstrip_orientation=='vertical'?(gallery_padding*2):gallery_padding+Math.max(gallery_padding,filmstrip_margin))+'px' }).appendTo(j_gallery); - - if(!window_loaded) { - $(window).load(function(){ - window_loaded = true; - buildGallery(); - }); - } else { - buildGallery(); - } + buildGallery(); }); }; diff --git a/eea/jquery/version.txt b/eea/jquery/version.txt index 2dbc24b..ef32e32 100644 --- a/eea/jquery/version.txt +++ b/eea/jquery/version.txt @@ -1 +1 @@ -11.0 +11.1