aboutsummaryrefslogtreecommitdiffstats
path: root/src/css.js
diff options
context:
space:
mode:
authorTimmy Willison <timmywillisn@gmail.com>2013-10-15 10:40:48 -0400
committerTimmy Willison <timmywillisn@gmail.com>2013-10-15 10:40:48 -0400
commita5037cb9e3851b171b49f6d717fb40e59aa344c2 (patch)
tree355cdce844870aafd02f11ca11b2528b6ecdd92a /src/css.js
parent310b8f5b6e086de92531cc9c210c6eb9eb831dd8 (diff)
downloadjquery-a5037cb9e3851b171b49f6d717fb40e59aa344c2.tar.gz
jquery-a5037cb9e3851b171b49f6d717fb40e59aa344c2.zip
Fixes #14450. Remove CommonJS+AMD syntax.
Diffstat (limited to 'src/css.js')
-rw-r--r--src/css.js44
1 files changed, 21 insertions, 23 deletions
diff --git a/src/css.js b/src/css.js
index 3e319bfc2..79127ec0e 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/var/getStyles",
+ "./css/curCSS",
+ "./css/defaultDisplay",
+ "./css/addGetHookIf",
+ "./css/support",
+ "./data/var/data_priv",
+
+ "./core/init",
+ "./css/swap",
+ "./core/ready",
+ "./selector" // contains
+], function( jQuery, pnum, access, rmargin, rnumnonpx, cssExpand, isHidden,
+ getStyles, curCSS, defaultDisplay, addGetHookIf, support, data_priv ) {
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" ),
- getStyles = require( "./css/var/getStyles" ),
- curCSS = require( "./css/curCSS" ),
- support = require( "./css/support" ),
- defaultDisplay = require( "./css/defaultDisplay" ),
- addGetHookIf = require( "./css/addGetHookIf" ),
- data_priv = require( "./data/var/data_priv" ),
-
// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
rdisplayswap = /^(none|table(?!-c[ea]).+)/,
@@ -31,12 +35,6 @@ var
cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
-// Dependencies not needed as vars
-require( "./core/init" );
-require( "./css/swap" );
-require( "./core/ready" );
-require( "./selector" ); // contains
-
// return a css property mapped to a potentially vendor prefixed property
function vendorPropName( style, name ) {