Commit a18f6820 authored by jeresig's avatar jeresig

Made some code tweaks related to running jQuery through JSLint (thanks to...

Made some code tweaks related to running jQuery through JSLint (thanks to Lorin Larson for the JSLint run).
parent 5353c6bc
...@@ -278,8 +278,10 @@ jQuery.extend({ ...@@ -278,8 +278,10 @@ jQuery.extend({
s.url += (rquery.test(s.url) ? "&" : "?") + s.data; s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
} }
jQuery.active++;
// Watch for a new set of requests // Watch for a new set of requests
if ( s.global && ! jQuery.active++ ) { if ( s.global && jQuery.active === 1 ) {
jQuery.event.trigger( "ajaxStart" ); jQuery.event.trigger( "ajaxStart" );
} }
...@@ -386,7 +388,7 @@ jQuery.extend({ ...@@ -386,7 +388,7 @@ jQuery.extend({
} }
if ( s.global ) { if ( s.global ) {
trigger("ajaxSend", [xhr, s]); contextTrigger("ajaxSend", [xhr, s]);
} }
// Wait for a response to come back // Wait for a response to come back
...@@ -499,7 +501,7 @@ jQuery.extend({ ...@@ -499,7 +501,7 @@ jQuery.extend({
// Fire the global callback // Fire the global callback
if ( s.global ) { if ( s.global ) {
trigger( "ajaxSuccess", [xhr, s] ); contextTrigger( "ajaxSuccess", [xhr, s] );
} }
} }
...@@ -511,7 +513,7 @@ jQuery.extend({ ...@@ -511,7 +513,7 @@ jQuery.extend({
// The request was completed // The request was completed
if ( s.global ) { if ( s.global ) {
trigger( "ajaxComplete", [xhr, s] ); contextTrigger( "ajaxComplete", [xhr, s] );
} }
// Handle the global AJAX counter // Handle the global AJAX counter
...@@ -520,7 +522,7 @@ jQuery.extend({ ...@@ -520,7 +522,7 @@ jQuery.extend({
} }
} }
function trigger(type, args) { function contextTrigger(type, args) {
(s.context ? jQuery(s.context) : jQuery.event).trigger(type, args); (s.context ? jQuery(s.context) : jQuery.event).trigger(type, args);
} }
......
...@@ -82,34 +82,15 @@ jQuery.extend({ ...@@ -82,34 +82,15 @@ jQuery.extend({
css: function( elem, name, force, extra ) { css: function( elem, name, force, extra ) {
if ( name === "width" || name === "height" ) { if ( name === "width" || name === "height" ) {
var val, props = cssShow, which = name === "width" ? cssWidth : cssHeight; if ( elem.offsetWidth !== 0 ) {
val = getWH( elem, name, extra );
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 { } else {
val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0; jQuery.swap( elem, cssShow, function() {
} val = getWH( elem, name, extra );
}); });
} }
if ( elem.offsetWidth !== 0 ) {
getWH();
} else {
jQuery.swap( elem, props, getWH );
}
return Math.max(0, Math.round(val)); return Math.max(0, Math.round(val));
} }
...@@ -211,6 +192,30 @@ jQuery.extend({ ...@@ -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 ) { if ( jQuery.expr && jQuery.expr.filters ) {
jQuery.expr.filters.hidden = function( elem ) { jQuery.expr.filters.hidden = function( elem ) {
var width = elem.offsetWidth, height = elem.offsetHeight, var width = elem.offsetWidth, height = elem.offsetHeight,
......
...@@ -51,7 +51,7 @@ jQuery.event = { ...@@ -51,7 +51,7 @@ jQuery.event = {
} }
var events = elemData.events = elemData.events || {}, var events = elemData.events = elemData.events || {},
eventHandle = elemData.handle, eventHandle; eventHandle = elemData.handle;
if ( !eventHandle ) { if ( !eventHandle ) {
elemData.handle = eventHandle = function() { elemData.handle = eventHandle = function() {
...@@ -980,10 +980,10 @@ jQuery.each(["live", "die"], function( i, name ) { ...@@ -980,10 +980,10 @@ jQuery.each(["live", "die"], function( i, name ) {
if ( name === "live" ) { if ( name === "live" ) {
// bind live handler // bind live handler
context.each(function(){ for ( var j = 0, l = context.length; j < l; j++ ) {
jQuery.event.add( this, liveConvert( type, selector ), jQuery.event.add( context[j], liveConvert( type, selector ),
{ data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } ); { data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
}); }
} else { } else {
// unbind live handler // unbind live handler
...@@ -992,7 +992,7 @@ jQuery.each(["live", "die"], function( i, name ) { ...@@ -992,7 +992,7 @@ jQuery.each(["live", "die"], function( i, name ) {
} }
return this; return this;
} };
}); });
function liveHandler( event ) { function liveHandler( event ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment