From 62900a9edbb5bb1f89916ff04cecd421b3f6f6e5 Mon Sep 17 00:00:00 2001 From: Timmy Willison Date: Tue, 15 Oct 2013 10:40:48 -0400 Subject: [PATCH] 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 --- build/tasks/build.js | 11 +++++------ src/core.js | 24 +++++++++++------------ src/css.js | 45 ++++++++++++++++++++++---------------------- src/effects.js | 31 +++++++++++++++--------------- src/event.js | 29 ++++++++++++++-------------- src/manipulation.js | 39 +++++++++++++++++--------------------- src/offset.js | 33 +++++++++++++++++--------------- 7 files changed, 104 insertions(+), 108 deletions(-) diff --git a/build/tasks/build.js b/build/tasks/build.js index 8fde24be9..e329e45e8 100644 --- a/build/tasks/build.js +++ b/build/tasks/build.js @@ -69,13 +69,12 @@ module.exports = function( grunt ) { .replace( /define\([^{]*?{/, "" ) .replace( rdefineEnd, "" ); - // Remove CommonJS-style require calls - // Keep an ending semicolon + // Remove anything wrapped with + // /* ExcludeStart */ /* ExcludeEnd */ + // or a single line directly after a // BuildExclude comment contents = contents - .replace( /(\s+\w+ = )?\s*require\(\s*(")[\w\.\/]+\2\s*\)[\.\w]*([,;])/g, - function( all, isVar, quote, commaSemicolon ) { - return isVar && commaSemicolon === ";" ? ";" : ""; - }); + .replace( /\/\*\s*ExcludeStart\s*\*\/[\w\W]*?\/\*\s*ExcludeEnd\s*\*\//ig, "" ) + .replace( /\/\/\s*BuildExclude\n\r?[\w\W]*?\n\r?/ig, "" ); // Remove empty definitions contents = contents diff --git a/src/core.js b/src/core.js index 670d5cadd..11ab78b18 100644 --- a/src/core.js +++ b/src/core.js @@ -1,17 +1,17 @@ -define(function( require ) { +define([ + "./var/deletedIds", + "./var/slice", + "./var/concat", + "./var/push", + "./var/indexOf", + "./var/class2type", + "./var/toString", + "./var/hasOwn", + "./var/trim", + "./var/support" +], function( deletedIds, slice, concat, push, indexOf, class2type, toString, hasOwn, trim, support ) { var - deletedIds = require( "./var/deletedIds" ), - slice = require( "./var/slice" ), - concat = require( "./var/concat" ), - push = require( "./var/push" ), - indexOf = require( "./var/indexOf" ), - class2type = require( "./var/class2type" ), - toString = require( "./var/toString" ), - hasOwn = require( "./var/hasOwn" ), - trim = require( "./var/trim" ), - support = require( "./var/support" ), - // Map over jQuery in case of overwrite _jQuery = window.jQuery, diff --git a/src/css.js b/src/css.js index a4d0b55df..09d789168 100644 --- a/src/css.js +++ b/src/css.js @@ -1,22 +1,26 @@ -// Require more than a few needed variables -// Keep in mind that a dependency array cannot be used with CommonJS+AMD syntax -define(function( require ) { +define([ + "./core", + "./var/pnum", + "./core/access", + "./css/var/rmargin", + "./css/var/rnumnonpx", + "./css/var/cssExpand", + "./css/var/isHidden", + "./css/curCSS", + "./css/defaultDisplay", + "./css/addGetHookIf", + "./css/support", + + "./core/init", + "./css/swap", + "./core/ready", + "./selector" // contains +], function( jQuery, pnum, access, rmargin, rnumnonpx, cssExpand, isHidden, + curCSS, defaultDisplay, addGetHookIf, support ) { var - jQuery = require( "./core" ), - pnum = require( "./var/pnum" ), - access = require( "./core/access" ), - rmargin = require( "./css/var/rmargin" ), - rnumnonpx = require( "./css/var/rnumnonpx" ), - cssExpand = require( "./css/var/cssExpand" ), - isHidden = require( "./css/var/isHidden" ), - // This format is here to facilitate easy removal when building - getStyles = require( "./css/curCSS" ).getStyles, - curCSS = require( "./css/curCSS" ).curCSS, - support = require( "./css/support" ), - defaultDisplay = require( "./css/defaultDisplay" ), - addGetHookIf = require( "./css/addGetHookIf" ), - + // BuildExclude + getStyles = curCSS.getStyles, ralpha = /alpha\([^)]*\)/i, ropacity = /opacity\s*=\s*([^)]*)/, @@ -34,11 +38,8 @@ var cssPrefixes = [ "Webkit", "O", "Moz", "ms" ]; -// Dependencies not needed as vars -require( "./core/init" ); -require( "./css/swap" ); -require( "./core/ready" ); -require( "./selector" ); // contains +// BuildExclude +curCSS = curCSS.curCSS; // return a css property mapped to a potentially vendor prefixed property function vendorPropName( style, name ) { 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() { 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; } diff --git a/src/manipulation.js b/src/manipulation.js index 30ba48430..08a9b7c04 100644 --- a/src/manipulation.js +++ b/src/manipulation.js @@ -1,6 +1,19 @@ -// Require more than a few needed variables -// Keep in mind that a dependency array cannot be used with CommonJS+AMD syntax -define(function( require ){ +define([ + "./core", + "./var/strundefined", + "./var/concat", + "./var/push", + "./var/deletedIds", + "./core/access", + "./manipulation/var/rcheckableType", + "./manipulation/support", + + "./core/init", + "./data/accepts", + "./traversing", + "./selector", + "./event" +], function( jQuery, strundefined, concat, push, deletedIds, access, rcheckableType, support ) { function createSafeFragment( document ) { var list = nodeNames.split( "|" ), @@ -16,22 +29,11 @@ function createSafeFragment( document ) { return safeFrag; } -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|" + +var 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 = /