mirror of
https://github.com/jquery/jquery.git
synced 2025-01-10 18:24:24 +00:00
Fixed a handful of places where $() was used explicitly, rather than jQuery().
This commit is contained in:
parent
bcc8a83705
commit
288b1a6730
12
src/jquery/jquery.js
vendored
12
src/jquery/jquery.js
vendored
@ -38,11 +38,11 @@ function jQuery(a,c) {
|
|||||||
|
|
||||||
// Watch for when a jQuery object is passed as the selector
|
// Watch for when a jQuery object is passed as the selector
|
||||||
if ( a.jquery )
|
if ( a.jquery )
|
||||||
return $( jQuery.merge( a, [] ) );
|
return jQuery( jQuery.merge( a, [] ) );
|
||||||
|
|
||||||
// Watch for when a jQuery object is passed at the context
|
// Watch for when a jQuery object is passed at the context
|
||||||
if ( c && c.jquery )
|
if ( c && c.jquery )
|
||||||
return $( c ).find(a);
|
return jQuery( c ).find(a);
|
||||||
|
|
||||||
// If the context is global, return a new object
|
// If the context is global, return a new object
|
||||||
if ( window == this )
|
if ( window == this )
|
||||||
@ -823,7 +823,7 @@ jQuery.extend({
|
|||||||
var a = arguments;
|
var a = arguments;
|
||||||
return this.each(function(){
|
return this.each(function(){
|
||||||
for ( var j = 0; j < a.length; j++ )
|
for ( var j = 0; j < a.length; j++ )
|
||||||
$(a[j])[n]( this );
|
jQuery(a[j])[n]( this );
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
@ -924,7 +924,7 @@ jQuery.extend({
|
|||||||
oHeight = e.offsetHeight;
|
oHeight = e.offsetHeight;
|
||||||
oWidth = e.offsetWidth;
|
oWidth = e.offsetWidth;
|
||||||
} else {
|
} else {
|
||||||
e = $(e.cloneNode(true)).css({
|
e = jQuery(e.cloneNode(true)).css({
|
||||||
visibility: "hidden", position: "absolute", display: "block"
|
visibility: "hidden", position: "absolute", display: "block"
|
||||||
}).prependTo("body")[0];
|
}).prependTo("body")[0];
|
||||||
|
|
||||||
@ -2460,7 +2460,7 @@ jQuery.macros = {
|
|||||||
* @cat Effects
|
* @cat Effects
|
||||||
*/
|
*/
|
||||||
toggle: function(){
|
toggle: function(){
|
||||||
$(this)[ $(this).is(":hidden") ? "show" : "hide" ].apply( $(this), arguments );
|
jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ].apply( jQuery(this), arguments );
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -2604,7 +2604,7 @@ jQuery.macros = {
|
|||||||
*/
|
*/
|
||||||
bind: function( type, fn ) {
|
bind: function( type, fn ) {
|
||||||
if ( fn.constructor == String )
|
if ( fn.constructor == String )
|
||||||
fn = new Function("e", ( !fn.indexOf(".") ? "$(this)" : "return " ) + fn);
|
fn = new Function("e", ( !fn.indexOf(".") ? "jQuery(this)" : "return " ) + fn);
|
||||||
jQuery.event.add( this, type, fn );
|
jQuery.event.add( this, type, fn );
|
||||||
},
|
},
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user