diff options
| author | Timmy Willison <timmywillisn@gmail.com> | 2013-09-09 11:26:21 -0400 |
|---|---|---|
| committer | Timmy Willison <timmywillisn@gmail.com> | 2013-09-09 12:04:03 -0400 |
| commit | 2063d6c1896b0c46c39fa0fdecef817f2e6f57c3 (patch) | |
| tree | 1b642c7a1f956ddfb665487c13b8b04d5a4157ee /src/dimensions.js | |
| parent | fb599f6315512f64e50d02661990cf34bb40c7db (diff) | |
| download | jquery-2063d6c1896b0c46c39fa0fdecef817f2e6f57c3.tar.gz jquery-2063d6c1896b0c46c39fa0fdecef817f2e6f57c3.zip | |
Break jQuery.access out into its own module to separate it from core; Adjust CommonJS+AMD build support to include non-var dependencies. Convert modules with more than a few dependencies to use CJS+AMD syntax.
Conflicts:
src/core.js
src/css.js
src/data.js
src/effects.js
src/event.js
src/manipulation.js
src/traversing.js
Diffstat (limited to 'src/dimensions.js')
| -rw-r--r-- | src/dimensions.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/dimensions.js b/src/dimensions.js index c7a7d1824..9dc9414a8 100644 --- a/src/dimensions.js +++ b/src/dimensions.js @@ -1,7 +1,8 @@ define([ "./core", + "./core/access", "./css" -], function( jQuery ) { +], function( jQuery, access ) { // Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods jQuery.each( { Height: "height", Width: "width" }, function( name, type ) { jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) { @@ -10,7 +11,7 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) { var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ), extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" ); - return jQuery.access( this, function( elem, type, value ) { + return access( this, function( elem, type, value ) { var doc; if ( jQuery.isWindow( elem ) ) { |