diff options
author | Timmy Willison <timmywillisn@gmail.com> | 2013-10-15 10:40:48 -0400 |
---|---|---|
committer | Timmy Willison <timmywillisn@gmail.com> | 2013-10-15 11:59:16 -0400 |
commit | 62900a9edbb5bb1f89916ff04cecd421b3f6f6e5 (patch) | |
tree | e6ec11b2d9f0dd0419639444e8ffe77749195277 /src/effects.js | |
parent | 03dd51494f25b79afb817db4ba83f4fbf0d8a646 (diff) | |
download | jquery-62900a9edbb5bb1f89916ff04cecd421b3f6f6e5.tar.gz jquery-62900a9edbb5bb1f89916ff04cecd421b3f6f6e5.zip |
Fixes #14450. Remove CommonJS+AMD syntax.
- To keep file size unaffected, an extra pragma was added to build.js to remove certain lines when building with special comments.
Conflicts:
src/core.js
src/css.js
src/effects.js
src/event.js
src/manipulation.js
src/offset.js
Diffstat (limited to 'src/effects.js')
-rw-r--r-- | src/effects.js | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/src/effects.js b/src/effects.js index 292f31af6..582870fe9 100644 --- a/src/effects.js +++ b/src/effects.js @@ -1,13 +1,20 @@ -define(function( require ) { +define([ + "./core", + "./var/pnum", + "./css/var/cssExpand", + "./css/var/isHidden", + "./css/defaultDisplay", + "./effects/support", + + "./core/init", + "./effects/Tween", + "./queue", + "./css", + "./deferred", + "./traversing" +], function( jQuery, pnum, cssExpand, isHidden, defaultDisplay, support ) { var - jQuery = require( "./core" ), - pnum = require( "./var/pnum" ), - cssExpand = require( "./css/var/cssExpand" ), - isHidden = require( "./css/var/isHidden" ), - defaultDisplay = require( "./css/defaultDisplay" ), - support = require( "./effects/support" ), - fxNow, timerId, rfxtypes = /^(?:toggle|show|hide)$/, rfxnum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ), @@ -64,14 +71,6 @@ var }] }; -// Dependencies not needed as vars -require( "./core/init" ); -require( "./effects/Tween" ); -require( "./queue" ); -require( "./css" ); -require( "./deferred" ); -require( "./traversing" ); - // Animations created synchronously will run synchronously function createFxNow() { setTimeout(function() { |