diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 98b90c289ca..5d9b6feb2e0 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -46,6 +46,8 @@ $.widget( "ui.tabs", { tabTemplate: "
  • #{label}
  • " }, + isRotating: false, + _create: function() { this._tabify( true ); }, @@ -308,6 +310,7 @@ $.widget( "ui.tabs", { .animate( showFx, showFx.duration || "normal", function() { resetStyle( $show, showFx ); self._trigger( "show", null, self._ui( clicked, $show[ 0 ] ) ); + self.isRotating = false; }); } : function( clicked, $show ) { @@ -351,6 +354,20 @@ $.widget( "ui.tabs", { return false; } + //if fx are being used + if(o.fx && ((jQuery.isArray( o.fx ) && o.fx[1]) || (!jQuery.isArray( o.fx ) && o.fx))){ + //if is rotating + if(self.isRotating){ + //return beacuse rotatin is in progress + return false; + }else{ + //continue starting new rotating + self.isRotating = true; + } + }else{ + //not using fx + } + o.selected = self.anchors.index( this ); self.abort(); @@ -719,7 +736,7 @@ $.extend( $.ui.tabs.prototype, { var t = o.selected; self.select( ++t < self.anchors.length ? t : 0 ); }, ms ); - + if ( e ) { e.stopPropagation(); }