From: Timmy Willison <timmywillisn@gmail.com>
Date: Wed, 11 Sep 2013 13:41:48 +0000 (-0500)
Subject: The cssHook from addGetHookIf wasn't actually getting added
X-Git-Tag: 1.11.0-beta1~22
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=577df985244ef3dcbc34c1e647ac9de513e94c3c;p=jquery.git

The cssHook from addGetHookIf wasn't actually getting added

Conflicts:
	src/css.js
---

diff --git a/src/css.js b/src/css.js
index 93c55f574..2a18aa4fc 100644
--- a/src/css.js
+++ b/src/css.js
@@ -417,7 +417,7 @@ if ( !support.opacity ) {
 	};
 }
 
-addGetHookIf( jQuery.cssHooks.marginRight, support.reliableMarginRight,
+jQuery.cssHooks.marginRight = addGetHookIf( support.reliableMarginRight,
 	function ( elem, computed ) {
 		if ( computed ) {
 			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
diff --git a/src/css/addGetHookIf.js b/src/css/addGetHookIf.js
index 2c2c47a68..214af953a 100644
--- a/src/css/addGetHookIf.js
+++ b/src/css/addGetHookIf.js
@@ -1,8 +1,8 @@
 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.
-	hookVar = {
+	return {
 		get: function() {
 			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),
 				// remove it.
 				// Since there are no other hooks for marginRight, remove the whole object.
-				delete hookVar.get;
+				delete this.get;
 				return;
 			}
 
 			// 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 );
 		}
 	};
 }
diff --git a/src/offset.js b/src/offset.js
index d73166a99..751cbf72a 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -191,7 +191,7 @@ jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( me
 // 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
 jQuery.each( [ "top", "left" ], function( i, prop ) {
-	addGetHookIf( jQuery.cssHooks[ prop ], support.pixelPosition,
+	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
 		function ( elem, computed ) {
 			if ( computed ) {
 				computed = curCSS( elem, prop );