Break jQuery.access out into its own module to separate it from core; Adjust CommonJS+AMD build support to include non-var dependencies. Convert modules with more than a few dependencies to use CJS+AMD syntax.

1 files changed, 22 insertions, 17 deletions

diff --git a/src/manipulation.js b/src/manipulation.js
index 1bae4f3db..b6e10f140 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -1,18 +1,23 @@
-define([
-	"./core",
-	"./var/concat",
-	"./var/push",
-	"./manipulation/var/rcheckableType",
-	"./manipulation/support",
-	"./data/var/data_priv",
-	"./data/var/data_user",
-	"./data/accepts",
-	"./selector",
-	"./traversing",
-	"./event"
-], function( jQuery, concat, push, rcheckableType, support, data_priv, data_user ){
-
-var rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
+// 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" );
+
+var
+	jQuery = require( "./core" ),
+	concat = require( "./var/concat" ),
+	push = require( "./var/push" ),
+	access = require( "./core/access" ),
+	rcheckableType = require( "./manipulation/var/rcheckableType" ),
+	support = require( "./manipulation/support" ),
+	data_priv = require( "./data/var/data_priv" ),
+	data_user = require( "./data/var/data_user" ),
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
 	rtagName = /<([\w:]+)/,
 	rhtml = /<|&#?\w+;/,
 	rnoInnerhtml = /<(?:script|style|link)/i,
@@ -44,7 +49,7 @@ wrapMap.th = wrapMap.td;
 
 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 ) );
@@ -134,7 +139,7 @@ jQuery.fn.extend({
 	},
 
 	html: function( value ) {
-		return jQuery.access( this, function( value ) {
+		return access( this, function( value ) {
 			var elem = this[ 0 ] || {},
 				i = 0,
 				l = this.length;