From 9541bd0bf2ca72795e8f2b2c1d3accc32afcac96 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Fri, 26 Mar 2010 19:53:43 -0400
Subject: Position: Use parseInt() to prevent fractional pixel values.

Fixes #5280 - ui.position generates different position in static context.
---
 ui/jquery.ui.position.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ui')

diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js
index f01640e18..11f8baa06 100644
--- a/ui/jquery.ui.position.js
+++ b/ui/jquery.ui.position.js
@@ -113,6 +113,10 @@ $.fn.position = function( options ) {
 			position.top -= elemHeight / 2;
 		}
 
+		// prevent fractions (see #5280)
+		position.left = parseInt( position.left );
+		position.top = parseInt( position.top );
+
 		$.each( [ "left", "top" ], function( i, dir ) {
 			if ( $.ui.position[ collision[i] ] ) {
 				$.ui.position[ collision[i] ][ dir ]( position, {
-- 
cgit v1.2.3


From 39229962316ddeeaa19b2c725ee32d46c38e687c Mon Sep 17 00:00:00 2001
From: jzaefferer <joern.zaefferer@gmail.com>
Date: Sat, 27 Mar 2010 01:47:42 +0100
Subject: Slider: Inlining _step method, was used only once

---
 ui/jquery.ui.slider.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js
index c392facd7..f0cc2ace1 100644
--- a/ui/jquery.ui.slider.js
+++ b/ui/jquery.ui.slider.js
@@ -152,7 +152,7 @@ $.widget("ui.slider", $.ui.mouse, {
 					break;
 			}
 
-			var curVal, newVal, step = self._step();
+			var curVal, newVal, step = self.options.step;
 			if (self.options.values && self.options.values.length) {
 				curVal = newVal = self.values(index);
 			} else {
@@ -526,11 +526,6 @@ $.widget("ui.slider", $.ui.mouse, {
 
 	},
 
-	_step: function() {
-		var step = this.options.step;
-		return step;
-	},
-
 	_value: function() {
 		//internal value getter
 		// _value() returns value trimmed by min and max
-- 
cgit v1.2.3


From b96ff11e3b30c93f5707d1299096b27a743974f8 Mon Sep 17 00:00:00 2001
From: jzaefferer <joern.zaefferer@gmail.com>
Date: Sat, 27 Mar 2010 01:49:56 +0100
Subject: Slider: Refactoring _valueMin and _valueMax methods, removing useless
 temporary variables

---
 ui/jquery.ui.slider.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js
index f0cc2ace1..bed4185e7 100644
--- a/ui/jquery.ui.slider.js
+++ b/ui/jquery.ui.slider.js
@@ -566,13 +566,11 @@ $.widget("ui.slider", $.ui.mouse, {
 	},
 
 	_valueMin: function() {
-		var valueMin = this.options.min;
-		return valueMin;
+		return this.options.min;
 	},
 
 	_valueMax: function() {
-		var valueMax = this.options.max;
-		return valueMax;
+		return this.options.max;
 	},
 	
 	_refreshValue: function() {
-- 
cgit v1.2.3


From 49411982c2ade2f678965b395a56e740a12d049e Mon Sep 17 00:00:00 2001
From: jzaefferer <joern.zaefferer@gmail.com>
Date: Sat, 27 Mar 2010 01:52:44 +0100
Subject: Slider: Refactoring _trimValue method to use more sane programming
 logic

---
 ui/jquery.ui.slider.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.slider.js b/ui/jquery.ui.slider.js
index bed4185e7..185fe809c 100644
--- a/ui/jquery.ui.slider.js
+++ b/ui/jquery.ui.slider.js
@@ -559,9 +559,12 @@ $.widget("ui.slider", $.ui.mouse, {
 	},
 	
 	_trimValue: function(val) {
-		if (val < this._valueMin()) val = this._valueMin();
-		if (val > this._valueMax()) val = this._valueMax();
-
+		if (val < this._valueMin()) {
+			return this._valueMin();
+		}
+		if (val > this._valueMax()) {
+			return this._valueMax();
+		}
 		return val;
 	},
 
-- 
cgit v1.2.3


From 551fa98ae4e1eafd3a152ca4897166537a069f16 Mon Sep 17 00:00:00 2001
From: jzaefferer <joern.zaefferer@gmail.com>
Date: Sat, 27 Mar 2010 08:03:48 +0100
Subject: Accordion: Moving IE layout fix (via zoom: 1) from js to css - fixes
 the destroy-method test in IEs (zoom style wasn't cleaned up on destroy) and
 should perform slightly faster, too

---
 themes/base/jquery.ui.accordion.css | 2 ++
 ui/jquery.ui.accordion.js           | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'ui')

diff --git a/themes/base/jquery.ui.accordion.css b/themes/base/jquery.ui.accordion.css
index acd7f5e1e..8d8a1a6e1 100644
--- a/themes/base/jquery.ui.accordion.css
+++ b/themes/base/jquery.ui.accordion.css
@@ -4,6 +4,8 @@
 .ui-accordion .ui-accordion-li-fix { display: inline; }
 .ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
 .ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+/* IE7-/Win - Fix extra vertical space in lists */
+.ui-accordion a { zoom: 1; }
 .ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
 .ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
 .ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index d1a7abd6d..bce78231b 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -74,11 +74,6 @@ $.widget("ui.accordion", {
 		//Append icon elements
 		this._createIcons();
 
-		// IE7-/Win - Extra vertical space in lists fixed
-		if ($.browser.msie) {
-			this.element.find('a').css('zoom', '1');
-		}
-
 		this.resize();
 
 		//ARIA
-- 
cgit v1.2.3