Skip to content
Permalink
Browse files

All non-var modules should not indent in their AMD wrappers (just for…

… prettier builds). No functionality changes.
  • Loading branch information...
timmywil committed Sep 9, 2013
1 parent 3b53b75 commit cd4a9cd7fa7093df92e64d5da9f18742254a8ca7
Showing with 143 additions and 131 deletions.
  1. +3 −2 src/ajax/parseJSON.js
  2. +21 −19 src/ajax/parseXML.js
  3. +3 −2 src/attributes.js
  4. +46 −44 src/core/access.js
  5. +32 −31 src/core/parseHTML.js
  6. +18 −17 src/css/swap.js
  7. +7 −5 src/effects/animatedSelector.js
  8. +13 −11 src/manipulation/_evalUrl.js
@@ -2,7 +2,8 @@ define([
"../core"
], function( jQuery ) {

jQuery.parseJSON = JSON.parse;
jQuery.parseJSON = JSON.parse;

return jQuery.parseJSON;

return jQuery.parseJSON;
});
@@ -1,26 +1,28 @@
define([
"../core"
], function( jQuery ) {
// Cross-browser xml parsing
jQuery.parseXML = function( data ) {
var xml, tmp;
if ( !data || typeof data !== "string" ) {
return null;
}

// Support: IE9
try {
tmp = new DOMParser();
xml = tmp.parseFromString( data , "text/xml" );
} catch ( e ) {
xml = undefined;
}
// Cross-browser xml parsing
jQuery.parseXML = function( data ) {
var xml, tmp;
if ( !data || typeof data !== "string" ) {
return null;
}

if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
jQuery.error( "Invalid XML: " + data );
}
return xml;
};
// Support: IE9
try {
tmp = new DOMParser();
xml = tmp.parseFromString( data , "text/xml" );
} catch ( e ) {
xml = undefined;
}

if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
jQuery.error( "Invalid XML: " + data );
}
return xml;
};

return jQuery.parseXML;

return jQuery.parseXML;
});
@@ -5,6 +5,7 @@ define([
"./attributes/classes",
"./attributes/val"
], function( jQuery ) {
// Return jQuery for attributes-only inclusion
return jQuery;

// Return jQuery for attributes-only inclusion
return jQuery;
});
@@ -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;
});
@@ -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;

});
@@ -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;
});
@@ -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;
};

});
@@ -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;

});

0 comments on commit cd4a9cd

Please sign in to comment.
You can’t perform that action at this time.