Fixed two bugs with togglling.
This commit is contained in:
parent
879225b3ae
commit
82e0a5a810
|
@ -2,7 +2,7 @@ jQuery.fn.extend({
|
|||
|
||||
// We're overriding the old toggle function, so
|
||||
// remember it for later
|
||||
_toggle: jQuery.fn.toggle,
|
||||
//_toggle: jQuery.fn.toggle,
|
||||
|
||||
/**
|
||||
* Toggle between two function calls every other click.
|
||||
|
|
8
fx/fx.js
8
fx/fx.js
|
@ -1,7 +1,7 @@
|
|||
jQuery.fn.extend({
|
||||
|
||||
// overwrite the old show method
|
||||
_show: jQuery.fn.show,
|
||||
//_show: jQuery.fn.show,
|
||||
|
||||
/**
|
||||
* Show all matched elements using a graceful animation.
|
||||
|
@ -37,7 +37,7 @@ jQuery.fn.extend({
|
|||
},
|
||||
|
||||
// Overwrite the old hide method
|
||||
_hide: jQuery.fn.hide,
|
||||
//_hide: jQuery.fn.hide,
|
||||
|
||||
/**
|
||||
* Hide all matched elements using a graceful animation.
|
||||
|
@ -440,8 +440,8 @@ jQuery.extend({
|
|||
z.el.oldOverflow = jQuery.css( z.el, "overflow" );
|
||||
|
||||
// Make sure that nothing sneaks out
|
||||
if ( z.el.oldOverlay == "visible" )
|
||||
y.overflow = "hidden";
|
||||
//if ( z.el.oldOverlay == "visible" )
|
||||
y.overflow = "hidden";
|
||||
|
||||
// Each step of an animation
|
||||
z.step = function(firstNum, lastNum){
|
||||
|
|
12
jquery/jquery.js
vendored
12
jquery/jquery.js
vendored
|
@ -748,8 +748,8 @@ jQuery.extend({
|
|||
jQuery.fn[ i ] = function(){
|
||||
var a = arguments;
|
||||
return this.each(function(){
|
||||
for ( var i = 0; i < a.length; i++ )
|
||||
$(a[i])[n]( this );
|
||||
for ( var j = 0; j < a.length; j++ )
|
||||
$(a[j])[n]( this );
|
||||
});
|
||||
};
|
||||
});
|
||||
|
@ -2137,7 +2137,7 @@ jQuery.macros = {
|
|||
* @name show
|
||||
* @type jQuery
|
||||
*/
|
||||
show: function(){
|
||||
_show: function(){
|
||||
this.style.display = this.oldblock ? this.oldblock : "";
|
||||
if ( jQuery.css(this,"display") == "none" )
|
||||
this.style.display = "block";
|
||||
|
@ -2153,7 +2153,7 @@ jQuery.macros = {
|
|||
* @name hide
|
||||
* @type jQuery
|
||||
*/
|
||||
hide: function(){
|
||||
_hide: function(){
|
||||
this.oldblock = this.oldblock || jQuery.css(this,"display");
|
||||
if ( this.oldblock == "none" )
|
||||
this.oldblock = "block";
|
||||
|
@ -2172,7 +2172,7 @@ jQuery.macros = {
|
|||
* @name toggle
|
||||
* @type jQuery
|
||||
*/
|
||||
toggle: function(){
|
||||
_toggle: function(){
|
||||
var d = jQuery.css(this,"display");
|
||||
$(this)[ !d || d == "none" ? "show" : "hide" ]();
|
||||
},
|
||||
|
@ -2335,4 +2335,4 @@ jQuery.macros = {
|
|||
jQuery.event.trigger( type, data, this );
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue