[Movecommons-commits] r313 - in trunk: src wp-theme

[Mario Gallegos]

Author: mgallegos
Date: 2012-05-09 15:46:31 +0200 (Wed, 09 May 2012)
New Revision: 313

Modified:
   trunk/src/jquery.bxSlider.js
   trunk/wp-theme/mc2-form.php
Log:


Modified: trunk/src/jquery.bxSlider.js
===================================================================
--- trunk/src/jquery.bxSlider.js	2012-05-09 13:29:08 UTC (rev 312)
+++ trunk/src/jquery.bxSlider.js	2012-05-09 13:46:31 UTC (rev 313)
@@ -601,9 +601,9 @@
 			// unwrap all bx-wrappers
 			$parent.unwrap().unwrap().removeAttr('style');
 			// remove any styles that were appended
-			$parent.children().removeAttr('style').not('.pager').remove();
+			$parent.children().removeAttr('style').not('.bx-child').remove();
 			// remove any childrent that were appended
-			$children.removeClass('pager');
+			$children.removeClass('bx-child');
 			
 		}
 		
@@ -640,7 +640,7 @@
 				  listStyle: 'none'
 				});					
 				$outerWrapper = $parent.parent().parent();
-				$children.addClass('pager');
+				$children.addClass('bx-child');
 			// CSS for vertical mode
 			}else if(options.mode == 'vertical'){
 				// wrap the <ul> in div that acts as a window and make the <ul> uber tall
@@ -657,7 +657,7 @@
 					height: childrenMaxHeight
 				});					
 				$outerWrapper = $parent.parent().parent();
-				$children.addClass('pager');
+				$children.addClass('bx-child');
 			// CSS for fade mode
 			}else if(options.mode == 'fade'){
 				// wrap the <ul> in div that acts as a window
@@ -792,7 +792,7 @@
 				options.tickerSpeed *= 10;
 												
 				// get the total width of the original show
-				$('.pager', $outerWrapper).each(function(index) {
+				$('.bx-child', $outerWrapper).each(function(index) {
 				  origShowWidth += $(this).width();
 					origShowHeight += $(this).height();
 				});
@@ -1147,7 +1147,8 @@
 					$('.bx-prev', $outerWrapper).show();
 				}
 				// check next
-				if(currentSlide == lastSlide){
+				if(currentSlide == lastSlide ||
+                    currentSlide + options.moveSlideQty > lastSlide){
 					$('.bx-next', $outerWrapper).hide();
 				}else{
 					$('.bx-next', $outerWrapper).show();
@@ -1160,9 +1161,9 @@
 		 */		
 		function getSlidePosition(number, side){			
 			if(side == 'left'){
-				var position = $('.pager', $outerWrapper).eq(number).position().left;
+				var position = $('.bx-child', $outerWrapper).eq(number).position().left;
 			}else if(side == 'top'){
-				var position = $('.pager', $outerWrapper).eq(number).position().top;
+				var position = $('.bx-child', $outerWrapper).eq(number).position().top;
 			}
 			return position;
 		}

Modified: trunk/wp-theme/mc2-form.php
===================================================================
--- trunk/wp-theme/mc2-form.php	2012-05-09 13:29:08 UTC (rev 312)
+++ trunk/wp-theme/mc2-form.php	2012-05-09 13:46:31 UTC (rev 313)
@@ -319,7 +319,7 @@
 	$j('#infield-other-license-website').inFieldLabels();
 	$j('#infield-url').inFieldLabels();
 	$j('#infield-terms-of-use-website').inFieldLabels();		
-	$j('#slider1').bxSlider({hideControlOnEnd:true});
+	$j('#slider1').bxSlider({ controls: false,hideControlOnEnd: true});
 	//$j('div.blockMe1').block({ message: null });
 	//$j('div.blockMe2').block({ message: null });
 	//$j('div.blockMe3').block({ message: null });