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/event.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/event.js')
-rw-r--r-- | src/event.js | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/src/event.js b/src/event.js index 3f900e2b4..a6f69f49f 100644 --- a/src/event.js +++ b/src/event.js @@ -1,23 +1,22 @@ -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, +define([ + "./core", + "./var/strundefined", + "./var/rnotwhite", + "./var/hasOwn", + "./var/slice", + "./event/support", + + "./core/init", + "./data/accepts", + "./selector" +], function( jQuery, strundefined, rnotwhite, hasOwn, slice, support ) { + +var rformElems = /^(?:input|select|textarea)$/i, rkeyEvent = /^key/, rmouseEvent = /^(?:mouse|contextmenu)|click/, rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, rtypenamespace = /^([^.]*)(?:\.(.+)|)$/; -// Dependencies not needed as vars -require( "./core/init" ); -require( "./data/accepts" ); -require( "./selector" ); - function returnTrue() { return true; } |