aboutsummaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorTimmy Willison <timmywillisn@gmail.com>2013-09-09 11:39:02 -0400
committerTimmy Willison <timmywillisn@gmail.com>2013-09-09 12:08:00 -0400
commitcd4a9cd7fa7093df92e64d5da9f18742254a8ca7 (patch)
treea08288e1726e9b5a424e7ef9dac6769dc3a4e268 /src/core
parent3b53b75160606610cc8f87404f89fc9e10441c4b (diff)
downloadjquery-cd4a9cd7fa7093df92e64d5da9f18742254a8ca7.tar.gz
jquery-cd4a9cd7fa7093df92e64d5da9f18742254a8ca7.zip
All non-var modules should not indent in their AMD wrappers (just for prettier builds). No functionality changes.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/access.js90
-rw-r--r--src/core/parseHTML.js63
2 files changed, 78 insertions, 75 deletions
diff --git a/src/core/access.js b/src/core/access.js
index 7ad2fd336..97b410b40 100644
--- a/src/core/access.js
+++ b/src/core/access.js
@@ -1,58 +1,60 @@
define([
"../core"
], function( jQuery ) {
- // Multifunctional method to get and set values of a collection
- // The value/s can optionally be executed if it's a function
- var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
- var i = 0,
- length = elems.length,
- bulk = key == null;
-
- // Sets many values
- if ( jQuery.type( key ) === "object" ) {
- chainable = true;
- for ( i in key ) {
- jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
- }
- // Sets one value
- } else if ( value !== undefined ) {
- chainable = true;
+// Multifunctional method to get and set values of a collection
+// The value/s can optionally be executed if it's a function
+var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
+ var i = 0,
+ length = elems.length,
+ bulk = key == null;
+
+ // Sets many values
+ if ( jQuery.type( key ) === "object" ) {
+ chainable = true;
+ for ( i in key ) {
+ jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
+ }
- if ( !jQuery.isFunction( value ) ) {
- raw = true;
- }
+ // Sets one value
+ } else if ( value !== undefined ) {
+ chainable = true;
- if ( bulk ) {
- // Bulk operations run against the entire set
- if ( raw ) {
- fn.call( elems, value );
- fn = null;
-
- // ...except when executing function values
- } else {
- bulk = fn;
- fn = function( elem, key, value ) {
- return bulk.call( jQuery( elem ), value );
- };
- }
+ if ( !jQuery.isFunction( value ) ) {
+ raw = true;
+ }
+
+ if ( bulk ) {
+ // Bulk operations run against the entire set
+ if ( raw ) {
+ fn.call( elems, value );
+ fn = null;
+
+ // ...except when executing function values
+ } else {
+ bulk = fn;
+ fn = function( elem, key, value ) {
+ return bulk.call( jQuery( elem ), value );
+ };
}
+ }
- if ( fn ) {
- for ( ; i < length; i++ ) {
- fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
- }
+ if ( fn ) {
+ for ( ; i < length; i++ ) {
+ fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
}
}
+ }
+
+ return chainable ?
+ elems :
- return chainable ?
- elems :
+ // Gets
+ bulk ?
+ fn.call( elems ) :
+ length ? fn( elems[0], key ) : emptyGet;
+};
- // Gets
- bulk ?
- fn.call( elems ) :
- length ? fn( elems[0], key ) : emptyGet;
- };
+return access;
- return access;
});
diff --git a/src/core/parseHTML.js b/src/core/parseHTML.js
index b097bfcc5..15e3e512f 100644
--- a/src/core/parseHTML.js
+++ b/src/core/parseHTML.js
@@ -4,35 +4,36 @@ define([
"../manipulation" // buildFragment
], function( jQuery, rsingleTag ) {
- // data: string of html
- // context (optional): If specified, the fragment will be created in this context, defaults to document
- // keepScripts (optional): If true, will include scripts passed in the html string
- jQuery.parseHTML = function( data, context, keepScripts ) {
- if ( !data || typeof data !== "string" ) {
- return null;
- }
- if ( typeof context === "boolean" ) {
- keepScripts = context;
- context = false;
- }
- context = context || document;
-
- var parsed = rsingleTag.exec( data ),
- scripts = !keepScripts && [];
-
- // Single tag
- if ( parsed ) {
- return [ context.createElement( parsed[1] ) ];
- }
-
- parsed = jQuery.buildFragment( [ data ], context, scripts );
-
- if ( scripts && scripts.length ) {
- jQuery( scripts ).remove();
- }
-
- return jQuery.merge( [], parsed.childNodes );
- };
-
- return jQuery.parseHTML;
+// data: string of html
+// context (optional): If specified, the fragment will be created in this context, defaults to document
+// keepScripts (optional): If true, will include scripts passed in the html string
+jQuery.parseHTML = function( data, context, keepScripts ) {
+ if ( !data || typeof data !== "string" ) {
+ return null;
+ }
+ if ( typeof context === "boolean" ) {
+ keepScripts = context;
+ context = false;
+ }
+ context = context || document;
+
+ var parsed = rsingleTag.exec( data ),
+ scripts = !keepScripts && [];
+
+ // Single tag
+ if ( parsed ) {
+ return [ context.createElement( parsed[1] ) ];
+ }
+
+ parsed = jQuery.buildFragment( [ data ], context, scripts );
+
+ if ( scripts && scripts.length ) {
+ jQuery( scripts ).remove();
+ }
+
+ return jQuery.merge( [], parsed.childNodes );
+};
+
+return jQuery.parseHTML;
+
});