deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Made some code tweaks related to running jQuery through JSLint (thanks to Lorin Larson for the JSLint run).

Browse source
This commit is contained in:
jeresig 2010-03-01 12:44:56 -05:00
parent 5353c6bcc3
commit a18f682012
5 changed files with 45 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/ajax.js
View file

@ -278,8 +278,10 @@ jQuery.extend({
s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
}
jQuery.active++;
// Watch for a new set of requests
if ( s.global && ! jQuery.active++ ) {
if ( s.global && jQuery.active === 1 ) {
jQuery.event.trigger( "ajaxStart" );
}
@ -386,7 +388,7 @@ jQuery.extend({
}
if ( s.global ) {
trigger("ajaxSend", [xhr, s]);
contextTrigger("ajaxSend", [xhr, s]);
}
// Wait for a response to come back
@ -499,7 +501,7 @@ jQuery.extend({
// Fire the global callback
if ( s.global ) {
trigger( "ajaxSuccess", [xhr, s] );
contextTrigger( "ajaxSuccess", [xhr, s] );
}
}
@ -511,7 +513,7 @@ jQuery.extend({
// The request was completed
if ( s.global ) {
trigger( "ajaxComplete", [xhr, s] );
contextTrigger( "ajaxComplete", [xhr, s] );
}
// Handle the global AJAX counter
@ -520,7 +522,7 @@ jQuery.extend({
}
}
function trigger(type, args) {
function contextTrigger(type, args) {
(s.context ? jQuery(s.context) : jQuery.event).trigger(type, args);
}

53
src/css.js
View file

@ -82,32 +82,13 @@ jQuery.extend({
css: function( elem, name, force, extra ) {
if ( name === "width" || name === "height" ) {
var val, props = cssShow, which = name === "width" ? cssWidth : cssHeight;
function getWH() {
val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
if ( extra === "border" ) {
return;
}
jQuery.each( which, function() {
if ( !extra ) {
val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
}
if ( extra === "margin" ) {
val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
} else {
val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
}
});
}
if ( elem.offsetWidth !== 0 ) {
getWH();
val = getWH( elem, name, extra );
} else {
jQuery.swap( elem, props, getWH );
jQuery.swap( elem, cssShow, function() {
val = getWH( elem, name, extra );
});
}
return Math.max(0, Math.round(val));
@ -211,6 +192,30 @@ jQuery.extend({
}
});
function getWH( elem, name, extra ) {
var which = name === "width" ? cssWidth : cssHeight,
val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
if ( extra === "border" ) {
return val;
}
jQuery.each( which, function() {
if ( !extra ) {
val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
}
if ( extra === "margin" ) {
val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
} else {
val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
}
});
return val;
}
if ( jQuery.expr && jQuery.expr.filters ) {
jQuery.expr.filters.hidden = function( elem ) {
var width = elem.offsetWidth, height = elem.offsetHeight,

10
src/event.js
View file

@ -51,7 +51,7 @@ jQuery.event = {
}
var events = elemData.events = elemData.events || {},
eventHandle = elemData.handle, eventHandle;
eventHandle = elemData.handle;
if ( !eventHandle ) {
elemData.handle = eventHandle = function() {
@ -980,10 +980,10 @@ jQuery.each(["live", "die"], function( i, name ) {
if ( name === "live" ) {
// bind live handler
context.each(function(){
jQuery.event.add( this, liveConvert( type, selector ),
for ( var j = 0, l = context.length; j < l; j++ ) {
jQuery.event.add( context[j], liveConvert( type, selector ),
{ data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
});
}
} else {
// unbind live handler
@ -992,7 +992,7 @@ jQuery.each(["live", "die"], function( i, name ) {
}
return this;
}
};
});
function liveHandler( event ) {