From 2063d6c1896b0c46c39fa0fdecef817f2e6f57c3 Mon Sep 17 00:00:00 2001 From: Timmy Willison Date: Mon, 9 Sep 2013 11:26:21 -0400 Subject: 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. Conflicts: src/core.js src/css.js src/data.js src/effects.js src/event.js src/manipulation.js src/traversing.js --- src/effects.js | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) (limited to 'src/effects.js') diff --git a/src/effects.js b/src/effects.js index 3817ba5d1..4428fc937 100644 --- a/src/effects.js +++ b/src/effects.js @@ -1,18 +1,14 @@ -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$/, @@ -68,6 +64,13 @@ var fxNow, timerId, }] }; +// 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() { -- cgit v1.2.3