From 6bc805971781d0bec97402328f0f21feaaa0a494 Mon Sep 17 00:00:00 2001 From: Timmy Willison Date: Mon, 9 Sep 2013 12:07:40 -0400 Subject: [PATCH] All non-var modules should not indent in their AMD wrappers (just for prettier builds). No functionality changes. --- src/ajax/parseJSON.js | 65 ++++++++++++------------ src/ajax/parseXML.js | 48 +++++++++--------- src/attributes.js | 5 +- src/core/access.js | 90 +++++++++++++++++---------------- src/core/parseHTML.js | 63 +++++++++++------------ src/css/swap.js | 35 ++++++------- src/effects/animatedSelector.js | 12 +++-- src/manipulation/_evalUrl.js | 24 +++++---- 8 files changed, 177 insertions(+), 165 deletions(-) diff --git a/src/ajax/parseJSON.js b/src/ajax/parseJSON.js index ff678623e..735015c9f 100644 --- a/src/ajax/parseJSON.js +++ b/src/ajax/parseJSON.js @@ -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; }); diff --git a/src/ajax/parseXML.js b/src/ajax/parseXML.js index ab2969992..a987f57fc 100644 --- a/src/ajax/parseXML.js +++ b/src/ajax/parseXML.js @@ -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; }); diff --git a/src/attributes.js b/src/attributes.js index b0d0f69c4..0569013d4 100644 --- a/src/attributes.js +++ b/src/attributes.js @@ -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; }); 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; + }); diff --git a/src/css/swap.js b/src/css/swap.js index 07a661c03..ce1643531 100644 --- a/src/css/swap.js +++ b/src/css/swap.js @@ -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; }); diff --git a/src/effects/animatedSelector.js b/src/effects/animatedSelector.js index c9fa68950..bc5a3d6c1 100644 --- a/src/effects/animatedSelector.js +++ b/src/effects/animatedSelector.js @@ -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; +}; + }); diff --git a/src/manipulation/_evalUrl.js b/src/manipulation/_evalUrl.js index 42ec67834..6704749ae 100644 --- a/src/manipulation/_evalUrl.js +++ b/src/manipulation/_evalUrl.js @@ -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; + }); -- 2.39.5