Merge branch 'dev' of github.com:jquerytools/jquerytools into dev

Author: bradrobertson

src/tabs/tabs.js

@@ -78,27 +78,30 @@
 		}		
 	};   	
 
-	var w;
-	
 	/**
 	 * Horizontal accordion
 	 * 
 	 * @deprecated will be replaced with a more robust implementation
-	 */
-	$.tools.tabs.addEffect("horizontal", function(i, done) {
+	*/
 
+	var w;
+	 
+	$.tools.tabs.addEffect("horizontal", function(i, done) {
+	  
 		// store original width of a pane into memory
-		if (!w) { w = this.getPanes().eq(0).width(); }
+		w || ( w = this.getPanes().eq(0).width() );
 
 		// set current pane's width to zero
-		this.getCurrentPane().animate({width: 0}, function() { $(this).hide(); });
-		
-		// grow opened pane to it's original width
-		this.getPanes().eq(i).animate({width: w}, function() { 
-			$(this).show();
-			done.call();
+		this.getCurrentPane().animate({width: 0}, function(){
+		  $(this).hide();
 		});
 
+    // grow opened pane to it's original width
+    this.getPanes().eq(i).animate({width: w}, function() { 
+     $(this).show();
+     done.call();
+    });
+		
 	});	
 
 
@@ -120,7 +123,7 @@
 		// public methods
 		$.extend(this, {				
 			click: function(i, e) {
-				
+			  
 				var tab = tabs.eq(i);												 
 
 				if (typeof i == 'string' && i.replace("#", "")) {
@@ -149,14 +152,13 @@
 				trigger.trigger(e, [i]);				
 				if (e.isDefaultPrevented()) { return; }
 
-				current = i;
-
 				// call the effect
 				effects[conf.effect].call(self, i, function() {
 
 					// onClick callback
 					e.type = "onClick";
 					trigger.trigger(e, [i]);					
+					current = i;
 				});			
 
 				// default behaviour

test/tabs/accordion-horizontal.htm

@@ -1,5 +1,5 @@
 
-<script src="../js/jquery-1.4.2.js"></script>
+<script src="../js/jquery-1.6.2.js"></script>
 <script src="../../src/tabs/tabs.js"></script>
 <link rel="stylesheet" type="text/css" href="css/horizontal.css"/> 
 
@@ -38,5 +38,7 @@ <h3>Third pane</h3>
 
 
 <script>		
-$("#accordion").tabs(".pane", { tabs: '.blok',  effect: 'horizontal'});
+  $(function(){
+    $("#accordion").tabs(".pane", { tabs: '.blok',  effect: 'horizontal'});
+  });
 </script>