library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

The cssHook from addGetHookIf wasn't actually getting added

Browse Source 
Conflicts:
	src/css.js
This commit is contained in:
Timmy Willison 2013-09-11 08:41:48 -05:00
parent baa8dff023
commit 577df98524
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/css.js
View File

@ -417,7 +417,7 @@ if ( !support.opacity ) {
}; };
} }
addGetHookIf( jQuery.cssHooks.marginRight, support.reliableMarginRight, jQuery.cssHooks.marginRight = addGetHookIf( support.reliableMarginRight,
function ( elem, computed ) { function ( elem, computed ) {
if ( computed ) { if ( computed ) {
// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right

9
src/css/addGetHookIf.js
View File

@ -1,8 +1,8 @@
define(function() { define(function() {
function addGetHookIf( hookVar, conditionFn, hookFn ) { function addGetHookIf( conditionFn, hookFn ) {
// Define the hook, we'll check on the first run if it's really needed. // Define the hook, we'll check on the first run if it's really needed.
hookVar = { return {
get: function() { get: function() {
var condition = conditionFn(); var condition = conditionFn();
@ -16,14 +16,13 @@ function addGetHookIf( hookVar, conditionFn, hookFn ) {
// Hook not needed (or it's not possible to use it due to missing dependency), // Hook not needed (or it's not possible to use it due to missing dependency),
// remove it. // remove it.
// Since there are no other hooks for marginRight, remove the whole object. // Since there are no other hooks for marginRight, remove the whole object.
delete hookVar.get; delete this.get;
return; return;
} }
// Hook needed; redefine it so that the support test is not executed again. // Hook needed; redefine it so that the support test is not executed again.
hookVar.get = hookFn;
return hookVar.get.apply( hookVar, arguments ); return (this.get = hookFn).apply( hookVar, arguments );
} }
}; };
} }

2
src/offset.js
View File

@ -191,7 +191,7 @@ jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( me
// getComputedStyle returns percent when specified for top/left/bottom/right // 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 // rather than make the css module depend on the offset module, we just check for it here
jQuery.each( [ "top", "left" ], function( i, prop ) { jQuery.each( [ "top", "left" ], function( i, prop ) {
addGetHookIf( jQuery.cssHooks[ prop ], support.pixelPosition, jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
function ( elem, computed ) { function ( elem, computed ) {
if ( computed ) { if ( computed ) {
computed = curCSS( elem, prop ); computed = curCSS( elem, prop );