fixed bug which resulted in possible overlap of filmstrip and navigat…

…ion buttons
jackwanders · Mar 27, 2012 · d068d7f · d068d7f
1 parent 23277d5
commit d068d7f
Showing 1 changed file with 30 additions and 14 deletions.
diff --git a/js/jquery.galleryview-3.0-dev.js b/js/jquery.galleryview-3.0-dev.js
@@ -184,7 +184,37 @@ if (typeof Object.create !== 'function') {
 				},
 				panels = [];
 
+			// nav
+			if(this.filmstripOrientation === 'horizontal') {
+				dom.gv_navWrap.css({
+					width: widths.prev + widths.play + widths.next,
+					height: Math.max(heights.prev,heights.play,heights.next)
+				});
+			} else {
+				if(this.opts.filmstrip_style === 'scroll' && this.opts.frame_width < (widths.prev + widths.play + widths.next)) {
+					dom.gv_navWrap.css({
+						width: Math.max(widths.prev, widths.play, widths.next),
+						height: heights.prev + heights.play + heights.next
+					});
+				} else {
+					dom.gv_navWrap.css({
+						width: widths.prev + widths.play + widths.next,
+						height: Math.max(heights.prev,heights.play,heights.next)
+					});
+				}
+			}
 
+			if(this.filmstripOrientation === 'vertical' && widths.filmstrip < (widths.prev + widths.play + widths.next)) {
+				dom.gv_navWrap.css({
+					width: Math.max(widths.prev, widths.play, widths.next),
+					height: heights.prev + heights.play + heights.next
+				});
+			} else {
+				dom.gv_navWrap.css({
+					width: widths.prev + widths.play + widths.next,
+					height: Math.max(heights.prev,heights.play,heights.next)
+				});
+			}
 
 			// panels
 			dom.gv_panel.css({
@@ -243,19 +273,6 @@ if (typeof Object.create !== 'function') {
 				height: heights.filmstrip
 			});
 
-			// nav
-			if(this.filmstripOrientation === 'vertical' && widths.filmstrip < (widths.prev + widths.play + widths.next)) {
-				dom.gv_navWrap.css({
-					width: Math.max(widths.prev, widths.play, widths.next),
-					height: heights.prev + heights.play + heights.next
-				});
-			} else {
-				dom.gv_navWrap.css({
-					width: widths.prev + widths.play + widths.next,
-					height: Math.max(heights.prev,heights.play,heights.next)
-				});
-			}
-
 			// gallery
 			if(this.opts.show_filmstrip) {
 				if(this.filmstripOrientation === 'horizontal') {
@@ -444,7 +461,6 @@ if (typeof Object.create !== 'function') {
 		initImages: function() {
 			var self = this,
 				dom = this.dom;
-
 			$.each(this.gvImages,function(i,gvImage) {
 				var img = $('<img/>');
 				img.css('visibility','hidden').data('index',i);