out: "dist/jquery.js",
// We have multiple minify steps
optimize: "none",
+ // Include dependencies loaded with require
+ findNestedDependencies: true,
+ // Avoid breaking semicolons inserted by r.js
skipSemiColonInsertion: true,
wrap: {
startFile: "src/intro.js",
// Remove CommonJS-style require calls
// Keep an ending semicolon
contents = contents
- .replace( /\w+ = require\(\s*(")[\w\.\/]+\1\s*\)([,;])/g,
+ .replace( /(?:\s+\w+ = )?\s*require\(\s*(")[\w\.\/]+\1\s*\)([,;])/g,
function( all, quote, commaSemicolon ) {
return commaSemicolon === ";" ? ";" : "";
});
"../core",
"../var/rnotwhite",
"../var/strundefined",
+ "../core/access",
"./support",
"./val",
"../selector"
-], function( jQuery, rnotwhite, strundefined, support ) {
+], function( jQuery, rnotwhite, strundefined, access, support ) {
var nodeHook, boolHook,
attrHandle = jQuery.expr.attrHandle,
jQuery.fn.extend({
attr: function( name, value ) {
- return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
+ return access( this, jQuery.attr, name, value, arguments.length > 1 );
},
removeAttr: function( name ) {
define([
"../core",
+ "../core/access",
"./support"
-], function( jQuery, support ) {
+], function( jQuery, access, support ) {
var rfocusable = /^(?:input|select|textarea|button|object)$/i,
rclickable = /^(?:a|area)$/i;
jQuery.fn.extend({
prop: function( name, value ) {
- return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
+ return access( this, jQuery.prop, name, value, arguments.length > 1 );
},
removeProp: function( name ) {
return proxy;
},
- // Multifunctional method to get and set values of a collection
- // The value/s can optionally be executed if it's a function
- 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;
-
- 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 ) ) );
- }
- }
- }
-
- return chainable ?
- elems :
-
- // Gets
- bulk ?
- fn.call( elems ) :
- length ? fn( elems[0], key ) : emptyGet;
- },
-
now: function() {
return ( new Date() ).getTime();
},
--- /dev/null
+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;
+
+ 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 ) ) );
+ }
+ }
+ }
+
+ return chainable ?
+ elems :
+
+ // Gets
+ bulk ?
+ fn.call( elems ) :
+ length ? fn( elems[0], key ) : emptyGet;
+ };
+
+ return access;
+});
-define([
- "./core",
- "./var/pnum",
- "./css/var/cssExpand",
- "./css/var/isHidden",
- "./css/defaultDisplay",
- "./css/support",
- "./css/swap",
- "./selector", // contains
- // Optional
- "./offset"
-], function( jQuery, pnum, cssExpand, isHidden, defaultDisplay, support ) {
-
-var getStyles, curCSS,
+// Require more than a few needed variables
+// Keep in mind that a dependency array cannot be used with CommonJS+AMD syntax
+define(function( require ) {
+
+var
+ jQuery = require( "./core" ),
+ pnum = require( "./var/pnum" ),
+ access = require( "./core/access" ),
+ cssExpand = require( "./css/var/cssExpand" ),
+ isHidden = require( "./css/var/isHidden" ),
+ support = require( "./css/support" ),
+ defaultDisplay = require( "./css/defaultDisplay" ),
+
+ getStyles, curCSS,
ralpha = /alpha\([^)]*\)/i,
ropacity = /opacity\s*=\s*([^)]*)/,
rposition = /^(top|right|bottom|left)$/,
+
// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
rdisplayswap = /^(none|table(?!-c[ea]).+)/,
cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
+// Dependencies not needed as vars
+require( "./css/swap" );
+require( "./core/ready" );
+require( "./selector" ); // contains
+// Optional
+require( "./offset" );
+
+
// NOTE: we've included the "window" in window.getComputedStyle
// because jsdom on node.js will break without it.
if ( window.getComputedStyle ) {
jQuery.fn.extend({
css: function( name, value ) {
- return jQuery.access( this, function( elem, name, value ) {
- var len, styles,
+ return access( this, function( elem, name, value ) {
+ var styles, len,
map = {},
i = 0;
var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
rmultiDash = /([A-Z])/g;
-
function dataAttr( elem, key, data ) {
// If nothing was found internally, try to fetch any
// data from the HTML5 data-* attribute
define([
"./core",
+ "./core/access",
"./css"
-], function( jQuery ) {
+], function( jQuery, access ) {
// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
- return jQuery.access( this, function( elem, type, value ) {
+ return access( this, function( elem, type, value ) {
var doc;
if ( jQuery.isWindow( elem ) ) {
-define([
- "./core",
- "./var/pnum",
- "./css/var/cssExpand",
- "./css/var/isHidden",
- "./css/defaultDisplay",
- "./effects/support",
- "./effects/Tween",
- "./queue",
- "./css",
- "./deferred",
- "./traversing"
-], function( jQuery, pnum, cssExpand, isHidden, defaultDisplay, support) {
-
-var fxNow, timerId,
+define(function( require ) {
+
+var
+ jQuery = require( "./core" ),
+ pnum = require( "./var/pnum" ),
+ cssExpand = require( "./css/var/cssExpand" ),
+ isHidden = require( "./css/var/isHidden" ),
+ defaultDisplay = require( "./css/defaultDisplay" ),
+ support = require( "./css/support" ),
+
+ fxNow, timerId,
rfxtypes = /^(?:toggle|show|hide)$/,
rfxnum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ),
rrun = /queueHooks$/,
}]
};
+// Dependencies not needed as vars
+require( "./effects/Tween" );
+require( "./queue" );
+require( "./css" );
+require( "./deferred" );
+require( "./traversing" );
+
// Animations created synchronously will run synchronously
function createFxNow() {
setTimeout(function() {
-define([
- "./core",
- "./var/strundefined",
- "./var/rnotwhite",
- "./var/hasOwn",
- "./var/slice",
- "./event/support",
- "./data/accepts",
- "./selector"
-], function( jQuery, strundefined, rnotwhite, hasOwn, slice, support ) {
-
-var rformElems = /^(?:input|select|textarea)$/i,
+define(function( require ) {
+
+var
+ jQuery = require( "./core" ),
+ strundefined = require( "./var/strundefined" ),
+ rnotwhite = require( "./var/rnotwhite" ),
+ hasOwn = require( "./var/hasOwn" ),
+ slice = require( "./var/slice" ),
+ support = require( "./event/support" ),
+ rformElems = /^(?:input|select|textarea)$/i,
rkeyEvent = /^key/,
rmouseEvent = /^(?:mouse|contextmenu)|click/,
rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
+// Dependencies not needed as vars
+require( "./data/accepts" );
+require( "./selector" );
+
function returnTrue() {
return true;
}
-define([
- "./core",
- "./var/concat",
- "./var/push",
- "./var/deletedIds",
- "./var/strundefined",
- "./manipulation/var/rcheckableType",
- "./manipulation/support",
- "./data/accepts",
- "./selector",
- "./traversing",
- "./event"
-], function( jQuery, concat, push, deletedIds, strundefined, rcheckableType, support ){
+// Require more than a few needed variables
+// Keep in mind that a dependency array cannot be used with CommonJS+AMD syntax
+define(function( require ){
+
+// Dependencies not needed as variables
+require( "./data/accepts" );
+require( "./traversing" );
+require( "./selector" );
+require( "./event" );
function createSafeFragment( document ) {
var list = nodeNames.split( "|" ),
return safeFrag;
}
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
+var
+ jQuery = require( "./core" ),
+ strundefined = require( "./var/strundefined" ),
+ concat = require( "./var/concat" ),
+ push = require( "./var/push" ),
+ deletedIds = require( "./var/deletedIds" ),
+ access = require( "./core/access" ),
+ rcheckableType = require( "./manipulation/var/rcheckableType" ),
+ support = require( "./manipulation/support" ),
+
+ nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
rleadingWhitespace = /^\s+/,
+
rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
rtagName = /<([\w:]+)/,
rtbody = /<tbody/i,
jQuery.fn.extend({
text: function( value ) {
- return jQuery.access( this, function( value ) {
+ return access( this, function( value ) {
return value === undefined ?
jQuery.text( this ) :
this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
},
html: function( value ) {
- return jQuery.access( this, function( value ) {
- var elem = this[0] || {},
+ return access( this, function( value ) {
+ var elem = this[ 0 ] || {},
i = 0,
l = this.length;
define([
"./core",
"./var/strundefined",
+ "./core/access",
"./css",
"./selector" // contains
-], function( jQuery, strundefined ) {
+], function( jQuery, strundefined, access ) {
var docElem = window.document.documentElement;
var top = /Y/.test( prop );
jQuery.fn[ method ] = function( val ) {
- return jQuery.access( this, function( elem, method, val ) {
+ return access( this, function( elem, method, val ) {
var win = getWindow( elem );
if ( val === undefined ) {
"./core",
"./selector"
], function( jQuery ) {
+
var isSimple = /^.[^:#\[\.,]*$/,
rparentsprev = /^(?:parents|prev(?:Until|All))/,
rneedsContext = jQuery.expr.match.needsContext,
"./core",
"./traversing" // parent, contents
], function( jQuery ) {
+
jQuery.fn.extend({
wrapAll: function( html ) {
if ( jQuery.isFunction( html ) ) {
projects / jquery.git / commitdiff