From 3c717d2e6a8cbf1ad16f68eac9c21f92abaf523c Mon Sep 17 00:00:00 2001 From: Timmy Willison Date: Sun, 8 Sep 2013 21:25:27 -0400 Subject: [PATCH] Always return jQuery in modules that can be included separately Conflicts: src/attributes.js src/data.js src/manipulation.js --- src/attributes.js | 6 +++++- src/callbacks.js | 1 + src/css.js | 1 + src/data.js | 1 + src/deferred.js | 2 ++ src/dimensions.js | 2 ++ src/effects.js | 2 +- src/event.js | 1 + src/manipulation.js | 2 +- src/offset.js | 1 + src/queue.js | 1 + src/serialize.js | 2 ++ src/traversing.js | 2 ++ src/wrap.js | 2 ++ 14 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/attributes.js b/src/attributes.js index f25c96a40..b0d0f69c4 100644 --- a/src/attributes.js +++ b/src/attributes.js @@ -1,6 +1,10 @@ define([ + "./core", "./attributes/val", "./attributes/attr", "./attributes/prop", "./attributes/classes" -]); +], function( jQuery ) { + // Return jQuery for attributes-only inclusion + return jQuery; +}); diff --git a/src/callbacks.js b/src/callbacks.js index 4928a9232..7090384ac 100644 --- a/src/callbacks.js +++ b/src/callbacks.js @@ -201,4 +201,5 @@ jQuery.Callbacks = function( options ) { return self; }; +return jQuery; }); diff --git a/src/css.js b/src/css.js index e40342d2d..32b933d8c 100644 --- a/src/css.js +++ b/src/css.js @@ -640,4 +640,5 @@ jQuery.each({ } }); +return jQuery; }); diff --git a/src/data.js b/src/data.js index de7268ef8..a2c725a5a 100644 --- a/src/data.js +++ b/src/data.js @@ -330,4 +330,5 @@ jQuery.fn.extend({ } }); +return jQuery; }); diff --git a/src/deferred.js b/src/deferred.js index 7ba164a8f..1c2f87e86 100644 --- a/src/deferred.js +++ b/src/deferred.js @@ -144,4 +144,6 @@ jQuery.extend({ return deferred.promise(); } }); + +return jQuery; }); diff --git a/src/dimensions.js b/src/dimensions.js index abedfe97e..c7a7d1824 100644 --- a/src/dimensions.js +++ b/src/dimensions.js @@ -43,4 +43,6 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) { }; }); }); + +return jQuery; }); diff --git a/src/effects.js b/src/effects.js index e64bf045a..3817ba5d1 100644 --- a/src/effects.js +++ b/src/effects.js @@ -635,5 +635,5 @@ jQuery.fx.speeds = { _default: 400 }; - +return jQuery; }); diff --git a/src/event.js b/src/event.js index 3ec6e400c..ddd5c6f36 100644 --- a/src/event.js +++ b/src/event.js @@ -1005,4 +1005,5 @@ jQuery.fn.extend({ } }); +return jQuery; }); diff --git a/src/manipulation.js b/src/manipulation.js index b98b08ce9..55d9c5bbd 100644 --- a/src/manipulation.js +++ b/src/manipulation.js @@ -745,5 +745,5 @@ jQuery.extend({ } }); +return jQuery; }); - diff --git a/src/offset.js b/src/offset.js index 93c5018a8..18a5dc038 100644 --- a/src/offset.js +++ b/src/offset.js @@ -182,4 +182,5 @@ jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( me }; }); +return jQuery; }); diff --git a/src/queue.js b/src/queue.js index f0e150110..f5a1b7467 100644 --- a/src/queue.js +++ b/src/queue.js @@ -138,4 +138,5 @@ jQuery.fn.extend({ } }); +return jQuery; }); diff --git a/src/serialize.js b/src/serialize.js index 369f63e74..f6deece83 100644 --- a/src/serialize.js +++ b/src/serialize.js @@ -104,4 +104,6 @@ function buildParams( prefix, obj, traditional, add ) { add( prefix, obj ); } } + +return jQuery; }); diff --git a/src/traversing.js b/src/traversing.js index 5d4c5025b..5f4d390e3 100644 --- a/src/traversing.js +++ b/src/traversing.js @@ -285,4 +285,6 @@ function winnow( elements, qualifier, not ) { return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not; }); } + +return jQuery; }); diff --git a/src/wrap.js b/src/wrap.js index ae1778712..19e3175e2 100644 --- a/src/wrap.js +++ b/src/wrap.js @@ -68,4 +68,6 @@ jQuery.fn.extend({ }).end(); } }); + +return jQuery; });