Commit dcf0fa50 authored by jeresig's avatar jeresig

More changes to get jQuery in line with JSLint.

parent 8c8f685a
This diff is collapsed.
...@@ -18,7 +18,7 @@ var jQuery = function( selector, context ) { ...@@ -18,7 +18,7 @@ var jQuery = function( selector, context ) {
// A simple way to check for HTML strings or ID strings // A simple way to check for HTML strings or ID strings
// (both of which we optimize for) // (both of which we optimize for)
quickExpr = /^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/, quickExpr = /^[^<]*(<[\w\W]+>)[^>]*$|^#([\w\-]+)$/,
// Is it a simple selector // Is it a simple selector
isSimple = /^.[^:#\[\.,]*$/, isSimple = /^.[^:#\[\.,]*$/,
...@@ -623,12 +623,14 @@ jQuery.extend({ ...@@ -623,12 +623,14 @@ jQuery.extend({
}, },
grep: function( elems, callback, inv ) { grep: function( elems, callback, inv ) {
var ret = []; var ret = [], retVal;
inv = !!inv;
// Go through the array, only saving the items // Go through the array, only saving the items
// that pass the validator function // that pass the validator function
for ( var i = 0, length = elems.length; i < length; i++ ) { for ( var i = 0, length = elems.length; i < length; i++ ) {
if ( !inv !== !callback( elems[ i ], i ) ) { retVal = !!callback( elems[ i ], i );
if ( inv !== retVal ) {
ret.push( elems[ i ] ); ret.push( elems[ i ] );
} }
} }
...@@ -748,7 +750,7 @@ function doScrollCheck() { ...@@ -748,7 +750,7 @@ function doScrollCheck() {
// If IE is used, use the trick by Diego Perini // If IE is used, use the trick by Diego Perini
// http://javascript.nwbox.com/IEContentLoaded/ // http://javascript.nwbox.com/IEContentLoaded/
document.documentElement.doScroll("left"); document.documentElement.doScroll("left");
} catch( error ) { } catch(e) {
setTimeout( doScrollCheck, 1 ); setTimeout( doScrollCheck, 1 );
return; return;
} }
......
...@@ -186,7 +186,7 @@ jQuery.extend({ ...@@ -186,7 +186,7 @@ jQuery.extend({
callback.call( elem ); callback.call( elem );
// Revert the old values // Revert the old values
for ( var name in options ) { for ( name in options ) {
elem.style[ name ] = old[ name ]; elem.style[ name ] = old[ name ];
} }
} }
......
var elemdisplay = {}, var elemdisplay = {},
rfxtypes = /toggle|show|hide/, rfxtypes = /toggle|show|hide/,
rfxnum = /^([+-]=)?([\d+-.]+)(.*)$/, rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
timerId, timerId,
fxAttrs = [ fxAttrs = [
// height animations // height animations
...@@ -221,6 +221,16 @@ jQuery.fn.extend({ ...@@ -221,6 +221,16 @@ jQuery.fn.extend({
}); });
function genFx( type, num ) {
var obj = {};
jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
obj[ this ] = type;
});
return obj;
}
// Generate shortcuts for custom animations // Generate shortcuts for custom animations
jQuery.each({ jQuery.each({
slideDown: genFx("show", 1), slideDown: genFx("show", 1),
...@@ -470,13 +480,3 @@ if ( jQuery.expr && jQuery.expr.filters ) { ...@@ -470,13 +480,3 @@ if ( jQuery.expr && jQuery.expr.filters ) {
}).length; }).length;
}; };
} }
function genFx( type, num ) {
var obj = {};
jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
obj[ this ] = type;
});
return obj;
}
...@@ -146,7 +146,7 @@ jQuery.event = { ...@@ -146,7 +146,7 @@ jQuery.event = {
handler = returnFalse; handler = returnFalse;
} }
var ret, type, fn, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType, var ret, type, fn, j, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
elemData = jQuery.data( elem ), elemData = jQuery.data( elem ),
events = elemData && elemData.events; events = elemData && elemData.events;
...@@ -197,7 +197,7 @@ jQuery.event = { ...@@ -197,7 +197,7 @@ jQuery.event = {
} }
if ( !handler ) { if ( !handler ) {
for ( var j = 0; j < eventType.length; j++ ) { for ( j = 0; j < eventType.length; j++ ) {
handleObj = eventType[ j ]; handleObj = eventType[ j ];
if ( all || namespace.test( handleObj.namespace ) ) { if ( all || namespace.test( handleObj.namespace ) ) {
...@@ -211,7 +211,7 @@ jQuery.event = { ...@@ -211,7 +211,7 @@ jQuery.event = {
special = jQuery.event.special[ type ] || {}; special = jQuery.event.special[ type ] || {};
for ( var j = pos || 0; j < eventType.length; j++ ) { for ( j = pos || 0; j < eventType.length; j++ ) {
handleObj = eventType[ j ]; handleObj = eventType[ j ];
if ( handler.guid === handleObj.guid ) { if ( handler.guid === handleObj.guid ) {
...@@ -329,7 +329,7 @@ jQuery.event = { ...@@ -329,7 +329,7 @@ jQuery.event = {
} }
// prevent IE from throwing an error for some elements with some event types, see #3533 // prevent IE from throwing an error for some elements with some event types, see #3533
} catch (e) {} } catch (inlineError) {}
if ( !event.isPropagationStopped() && parent ) { if ( !event.isPropagationStopped() && parent ) {
jQuery.event.trigger( event, data, parent, true ); jQuery.event.trigger( event, data, parent, true );
...@@ -356,7 +356,7 @@ jQuery.event = { ...@@ -356,7 +356,7 @@ jQuery.event = {
} }
// prevent IE from throwing an error for some elements with some event types, see #3533 // prevent IE from throwing an error for some elements with some event types, see #3533
} catch (e) {} } catch (triggerError) {}
if ( old ) { if ( old ) {
target[ "on" + type ] = old; target[ "on" + type ] = old;
...@@ -368,9 +368,9 @@ jQuery.event = { ...@@ -368,9 +368,9 @@ jQuery.event = {
}, },
handle: function( event ) { handle: function( event ) {
var all, handlers, namespaces, namespace, events; var all, handlers, namespaces, namespace, events, args = jQuery.makeArray( arguments );
event = arguments[0] = jQuery.event.fix( event || window.event ); event = args[0] = jQuery.event.fix( event || window.event );
event.currentTarget = this; event.currentTarget = this;
// Namespaced event handlers // Namespaced event handlers
...@@ -400,7 +400,7 @@ jQuery.event = { ...@@ -400,7 +400,7 @@ jQuery.event = {
event.data = handleObj.data; event.data = handleObj.data;
event.handleObj = handleObj; event.handleObj = handleObj;
var ret = handleObj.handler.apply( this, arguments ); var ret = handleObj.handler.apply( this, args );
if ( ret !== undefined ) { if ( ret !== undefined ) {
event.result = ret; event.result = ret;
...@@ -1080,7 +1080,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl ...@@ -1080,7 +1080,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl
// Handle event binding // Handle event binding
jQuery.fn[ name ] = function( data, fn ) { jQuery.fn[ name ] = function( data, fn ) {
if ( fn == undefined ) { if ( fn == null ) {
fn = data; fn = data;
data = null; data = null;
} }
......
...@@ -357,16 +357,16 @@ jQuery.fn.extend({ ...@@ -357,16 +357,16 @@ jQuery.fn.extend({
} }
return this; return this;
function root( elem, cur ) {
return jQuery.nodeName(elem, "table") ?
(elem.getElementsByTagName("tbody")[0] ||
elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
elem;
}
} }
}); });
function root( elem, cur ) {
return jQuery.nodeName(elem, "table") ?
(elem.getElementsByTagName("tbody")[0] ||
elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
elem;
}
function cloneCopyEvent(orig, ret) { function cloneCopyEvent(orig, ret) {
var i = 0; var i = 0;
...@@ -530,7 +530,7 @@ jQuery.extend({ ...@@ -530,7 +530,7 @@ jQuery.extend({
} }
if ( fragment ) { if ( fragment ) {
for ( var i = 0; ret[i]; i++ ) { for ( i = 0; ret[i]; i++ ) {
if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) { if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] ); scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
script.type = "text/javascript"; script.type = "text/javascript";
try { try {
script.appendChild( document.createTextNode( "window." + id + "=1;" ) ); script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
} catch(e) {} } catch( scriptError ) {}
root.insertBefore( script, root.firstChild ); root.insertBefore( script, root.firstChild );
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
try { try {
delete script.test; delete script.test;
} catch(e) { } catch( expandoError ) {
jQuery.support.deleteExpando = false; jQuery.support.deleteExpando = false;
} }
......
...@@ -7,7 +7,8 @@ var runtil = /Until$/, ...@@ -7,7 +7,8 @@ var runtil = /Until$/,
var winnow = function( elements, qualifier, keep ) { var winnow = function( elements, qualifier, keep ) {
if ( jQuery.isFunction( qualifier ) ) { if ( jQuery.isFunction( qualifier ) ) {
return jQuery.grep(elements, function( elem, i ) { return jQuery.grep(elements, function( elem, i ) {
return !!qualifier.call( elem, i, elem ) === keep; var retVal = !!qualifier.call( elem, i, elem );
return retVal === keep;
}); });
} else if ( qualifier.nodeType ) { } else if ( qualifier.nodeType ) {
......
...@@ -14,30 +14,28 @@ test("jQuery.ajax() - success callbacks", function() { ...@@ -14,30 +14,28 @@ test("jQuery.ajax() - success callbacks", function() {
stop(); stop();
setTimeout(function(){ jQuery('#foo').ajaxStart(function(){
jQuery('#foo').ajaxStart(function(){ ok( true, "ajaxStart" );
ok( true, "ajaxStart" ); }).ajaxStop(function(){
}).ajaxStop(function(){ ok( true, "ajaxStop" );
ok( true, "ajaxStop" ); start();
start(); }).ajaxSend(function(){
}).ajaxSend(function(){ ok( true, "ajaxSend" );
ok( true, "ajaxSend" ); }).ajaxComplete(function(){
}).ajaxComplete(function(){ ok( true, "ajaxComplete" );
ok( true, "ajaxComplete" ); }).ajaxError(function(){
}).ajaxError(function(){ ok( false, "ajaxError" );
ok( false, "ajaxError" ); }).ajaxSuccess(function(){
}).ajaxSuccess(function(){ ok( true, "ajaxSuccess" );
ok( true, "ajaxSuccess" ); });
});
jQuery.ajax({ jQuery.ajax({
url: url("data/name.html"), url: url("data/name.html"),
beforeSend: function(){ ok(true, "beforeSend"); }, beforeSend: function(){ ok(true, "beforeSend"); },
success: function(){ ok(true, "success"); }, success: function(){ ok(true, "success"); },
error: function(){ ok(false, "error"); }, error: function(){ ok(false, "error"); },
complete: function(){ ok(true, "complete"); } complete: function(){ ok(true, "complete"); }
}); });
}, 13);
}); });
test("jQuery.ajax() - error callbacks", function() { test("jQuery.ajax() - error callbacks", function() {
......
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