diff options
| author | Timmy Willison <timmywillisn@gmail.com> | 2013-08-29 16:18:17 -0400 |
|---|---|---|
| committer | Timmy Willison <timmywillisn@gmail.com> | 2013-08-29 16:18:17 -0400 |
| commit | 004c1fc5bb40ae8dfec18d6719534abad636b7e8 (patch) | |
| tree | 05de9c08c2f8234b611c902f29cf2540d89db0b0 /src | |
| parent | ca1c90e55c05610c28a176e3bcb2a64450b5e296 (diff) | |
| download | jquery-004c1fc5bb40ae8dfec18d6719534abad636b7e8.tar.gz jquery-004c1fc5bb40ae8dfec18d6719534abad636b7e8.zip | |
Pass all tests (and load Sizzle fixture correctly) when loading with AMD
Diffstat (limited to 'src')
| -rw-r--r-- | src/ajax/load.js | 5 | ||||
| -rw-r--r-- | src/css.js | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ajax/load.js b/src/ajax/load.js index e9c21ef16..b54750e0a 100644 --- a/src/ajax/load.js +++ b/src/ajax/load.js @@ -2,7 +2,10 @@ define([ "../core", "../ajax", "../traversing", - "../selector" + "../manipulation", + "../selector", + // Optional event/alias dependency + "../event/alias" ], function( jQuery ) { // Keep a copy of the old load method diff --git a/src/css.js b/src/css.js index caad0076a..4ac7dfbce 100644 --- a/src/css.js +++ b/src/css.js @@ -8,7 +8,9 @@ define([ "./core/swap", "./core/ready", "./selector", // contains - "./support" + "./support", + // Optional + "./offset" ], function( jQuery, pnum, cssExpand, isHidden, defaultDisplay, data_priv ) { var curCSS, // swappable if display is none or starts with table except "table", "table-cell", or "table-caption" @@ -467,7 +469,6 @@ jQuery(function() { // Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084 // getComputedStyle returns percent when specified for top/left/bottom/right // rather than make the css module depend on the offset module, we just check for it here - // TODO: Optional dependency on offset if ( !jQuery.support.pixelPosition && jQuery.fn.position ) { jQuery.each( [ "top", "left" ], function( i, prop ) { jQuery.cssHooks[ prop ] = { |