From 8e6e23925669faea03f83c387a62110d7482e827 Mon Sep 17 00:00:00 2001 From: Timmy Willison Date: Thu, 29 Aug 2013 16:18:17 -0400 Subject: Pass all tests (and load Sizzle fixture correctly) when loading with AMD Conflicts: src/css.js --- src/ajax/load.js | 5 ++++- src/css.js | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/ajax/load.js b/src/ajax/load.js index 74ccf5c4c..dde1823c0 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 f2c0473dd..68ffb8e83 100644 --- a/src/css.js +++ b/src/css.js @@ -6,7 +6,9 @@ define([ "./css/defaultDisplay", "./core/swap", "./selector", // contains - "./support" + "./support", + // Optional + "./offset" ], function( jQuery, pnum, cssExpand, isHidden, defaultDisplay ) { var getStyles, curCSS, @@ -563,7 +565,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 ] = { -- cgit v1.2.3