Skip to content
Permalink
Browse files

Made some code tweaks related to running jQuery through JSLint (thank…

…s to Lorin Larson for the JSLint run).
  • Loading branch information
jeresig committed Mar 1, 2010
1 parent 5353c6b commit a18f682012ae8e63f3b43b39375b3c5ce0a561e3
Showing with 45 additions and 38 deletions.
  1. +7 −5 src/ajax.js
  2. +1 −1 src/core.js
  3. +29 −24 src/css.js
  4. +3 −3 src/effects.js
  5. +5 −5 src/event.js
@@ -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);
}

@@ -693,7 +693,7 @@ jQuery.extend({
/(opera)(?:.*version)?[ \/]([\w.]+)/.exec( ua ) ||
/(msie) ([\w.]+)/.exec( ua ) ||
!/compatible/.test( ua ) && /(mozilla)(?:.*? rv:([\w.]+))?/.exec( ua ) ||
[];
[];

return { browser: match[1] || "", version: match[2] || "0" };
},
@@ -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,
@@ -443,9 +443,9 @@ jQuery.extend( jQuery.fx, {

speeds: {
slow: 600,
fast: 200,
// Default speed
_default: 400
fast: 200,
// Default speed
_default: 400
},

step: {
@@ -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 ) {

0 comments on commit a18f682

Please sign in to comment.
You can’t perform that action at this time.