]> source.dussan.org Git - jquery.git/commitdiff
All non-var modules should not indent in their AMD wrappers (just for prettier builds...
authorTimmy Willison <timmywillisn@gmail.com>
Mon, 9 Sep 2013 16:07:40 +0000 (12:07 -0400)
committerTimmy Willison <timmywillisn@gmail.com>
Mon, 9 Sep 2013 16:07:40 +0000 (12:07 -0400)
src/ajax/parseJSON.js
src/ajax/parseXML.js
src/attributes.js
src/core/access.js
src/core/parseHTML.js
src/css/swap.js
src/effects/animatedSelector.js
src/manipulation/_evalUrl.js

index ff678623ebf62f49b5f3d60af0a64a135ea6dc83..735015c9fe7f7b16f52246bc2b3a62a884aab77e 100644 (file)
@@ -2,40 +2,41 @@ define([
        "../core"
 ], function( jQuery ) {
 
-       var rvalidchars = /^[\],:{}\s]*$/,
-               rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-               rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
-               rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g;
-
-       jQuery.parseJSON = function( data ) {
-               // Attempt to parse using the native JSON parser first
-               if ( window.JSON && window.JSON.parse ) {
-                       return window.JSON.parse( data );
-               }
-
-               if ( data === null ) {
-                       return data;
-               }
-
-               if ( typeof data === "string" ) {
-
-                       // Make sure leading/trailing whitespace is removed (IE can't handle it)
-                       data = jQuery.trim( data );
-
-                       if ( data ) {
-                               // Make sure the incoming data is actual JSON
-                               // Logic borrowed from http://json.org/json2.js
-                               if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-                                       .replace( rvalidtokens, "]" )
-                                       .replace( rvalidbraces, "")) ) {
-
-                                       return ( new Function( "return " + data ) )();
-                               }
+var rvalidchars = /^[\],:{}\s]*$/,
+       rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
+       rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
+       rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g;
+
+jQuery.parseJSON = function( data ) {
+       // Attempt to parse using the native JSON parser first
+       if ( window.JSON && window.JSON.parse ) {
+               return window.JSON.parse( data );
+       }
+
+       if ( data === null ) {
+               return data;
+       }
+
+       if ( typeof data === "string" ) {
+
+               // Make sure leading/trailing whitespace is removed (IE can't handle it)
+               data = jQuery.trim( data );
+
+               if ( data ) {
+                       // Make sure the incoming data is actual JSON
+                       // Logic borrowed from http://json.org/json2.js
+                       if ( rvalidchars.test( data.replace( rvalidescape, "@" )
+                               .replace( rvalidtokens, "]" )
+                               .replace( rvalidbraces, "")) ) {
+
+                               return ( new Function( "return " + data ) )();
                        }
                }
+       }
+
+       jQuery.error( "Invalid JSON: " + data );
+};
 
-               jQuery.error( "Invalid JSON: " + data );
-       };
+return jQuery.parseJSON;
 
-       return jQuery.parseJSON;
 });
index ab2969992e84668e5ff01a99a657d62480c74a07..a987f57fc5f3bf635f90f9b7a07bf6a6b7fced6a 100644 (file)
@@ -1,29 +1,31 @@
 define([
        "../core"
 ], function( jQuery ) {
-       // Cross-browser xml parsing
-       jQuery.parseXML = function( data ) {
-               var xml, tmp;
-               if ( !data || typeof data !== "string" ) {
-                       return null;
-               }
-               try {
-                       if ( window.DOMParser ) { // Standard
-                               tmp = new DOMParser();
-                               xml = tmp.parseFromString( data , "text/xml" );
-                       } else { // IE
-                               xml = new ActiveXObject( "Microsoft.XMLDOM" );
-                               xml.async = "false";
-                               xml.loadXML( data );
-                       }
-               } catch( e ) {
-                       xml = undefined;
-               }
-               if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-                       jQuery.error( "Invalid XML: " + data );
+
+// Cross-browser xml parsing
+jQuery.parseXML = function( data ) {
+       var xml, tmp;
+       if ( !data || typeof data !== "string" ) {
+               return null;
+       }
+       try {
+               if ( window.DOMParser ) { // Standard
+                       tmp = new DOMParser();
+                       xml = tmp.parseFromString( data , "text/xml" );
+               } else { // IE
+                       xml = new ActiveXObject( "Microsoft.XMLDOM" );
+                       xml.async = "false";
+                       xml.loadXML( data );
                }
-               return xml;
-       };
+       } catch( e ) {
+               xml = undefined;
+       }
+       if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
+               jQuery.error( "Invalid XML: " + data );
+       }
+       return xml;
+};
+
+return jQuery.parseXML;
 
-       return jQuery.parseXML;
 });
index b0d0f69c4e9aafa2c55e8ef6260ae70824e34e5d..0569013d4f53c60b6c3edb04da0849124d0097e6 100644 (file)
@@ -5,6 +5,7 @@ define([
        "./attributes/prop",
        "./attributes/classes"
 ], function( jQuery ) {
-       // Return jQuery for attributes-only inclusion
-       return jQuery;
+
+// Return jQuery for attributes-only inclusion
+return jQuery;
 });
index 7ad2fd33645d1b849636cfd61735d83753ad15b0..97b410b40a5a080b50924f4cf151236f5a5a7082 100644 (file)
@@ -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;
 });
index b097bfcc507928e87735eacb7eb29aa9270744c1..15e3e512fff4a213b28894d967fc0c5c972a82db 100644 (file)
@@ -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;
+
 });
index 07a661c03d4564282a99e9cc5499d1eeef6e8c12..ce164353115f6d5ddda9358c3d82c97c30d6743a 100644 (file)
@@ -2,26 +2,27 @@ define([
        "../core"
 ], function( jQuery ) {
 
-       // A method for quickly swapping in/out CSS properties to get correct calculations.
-       jQuery.swap = function( elem, options, callback, args ) {
-               var ret, name,
-                       old = {};
+// A method for quickly swapping in/out CSS properties to get correct calculations.
+jQuery.swap = function( elem, options, callback, args ) {
+       var ret, name,
+               old = {};
 
-               // Remember the old values, and insert the new ones
-               for ( name in options ) {
-                       old[ name ] = elem.style[ name ];
-                       elem.style[ name ] = options[ name ];
-               }
+       // Remember the old values, and insert the new ones
+       for ( name in options ) {
+               old[ name ] = elem.style[ name ];
+               elem.style[ name ] = options[ name ];
+       }
 
-               ret = callback.apply( elem, args || [] );
+       ret = callback.apply( elem, args || [] );
 
-               // Revert the old values
-               for ( name in options ) {
-                       elem.style[ name ] = old[ name ];
-               }
+       // Revert the old values
+       for ( name in options ) {
+               elem.style[ name ] = old[ name ];
+       }
 
-               return ret;
-       };
+       return ret;
+};
+
+return jQuery.swap;
 
-       return jQuery.swap;
 });
index c9fa68950ae08c4f988d250920976debe190b542..bc5a3d6c11da38cf013cc722a9e557e0cf6762ad 100644 (file)
@@ -3,9 +3,11 @@ define([
        "../selector",
        "../effects"
 ], function( jQuery ) {
-       jQuery.expr.filters.animated = function( elem ) {
-               return jQuery.grep(jQuery.timers, function( fn ) {
-                       return elem === fn.elem;
-               }).length;
-       };
+
+jQuery.expr.filters.animated = function( elem ) {
+       return jQuery.grep(jQuery.timers, function( fn ) {
+               return elem === fn.elem;
+       }).length;
+};
+
 });
index 42ec678347569a1fead962aec2c28d58ac9b0f70..6704749ae353677f0b4a181ffe605b267a8e8efb 100644 (file)
@@ -1,16 +1,18 @@
 define([
        "../ajax"
 ], function( jQuery ) {
-       jQuery._evalUrl = function( url ) {
-               return jQuery.ajax({
-                       url: url,
-                       type: "GET",
-                       dataType: "script",
-                       async: false,
-                       global: false,
-                       "throws": true
-               });
-       };
 
-       return jQuery._evalUrl;
+jQuery._evalUrl = function( url ) {
+       return jQuery.ajax({
+               url: url,
+               type: "GET",
+               dataType: "script",
+               async: false,
+               global: false,
+               "throws": true
+       });
+};
+
+return jQuery._evalUrl;
+
 });