From 541e7349b6533eb533c15d17e3e9e432e4a719ea Mon Sep 17 00:00:00 2001
From: John Hoven <hovenj@gmail.com>
Date: Thu, 6 Mar 2014 13:56:09 -0600
Subject: [PATCH] Attributes: Trim whitespace from option text when returned as
 a value

Fixes #14858
Ref #14686
Closes gh-1531
(cherry picked from commit 9ec429cf6270e455aba4eba85f4db80e633806b6)

Conflicts:
	src/attributes/val.js
---
 AUTHORS.txt             |  1 +
 src/attributes/val.js   | 10 ++++++++++
 test/unit/attributes.js | 13 +++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 5a4b804a8..f68f3304a 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -219,4 +219,5 @@ S. Andrew Sheppard <andrew@wq.io>
 Roman Reiß <me@silverwind.io>
 Benjy Cui <benjytrys@gmail.com>
 Rodrigo Rosenfeld Rosas <rr.rosas@gmail.com>
+John Hoven <hovenj@gmail.com>
 
diff --git a/src/attributes/val.js b/src/attributes/val.js
index 6d6b8ea7c..42ef32343 100644
--- a/src/attributes/val.js
+++ b/src/attributes/val.js
@@ -71,6 +71,16 @@ jQuery.fn.extend({
 
 jQuery.extend({
 	valHooks: {
+		option: {
+			get: function( elem ) {
+				var val = jQuery.find.attr( elem, "value" );
+				return val != null ?
+					val :
+					// Support: IE10-11+
+					// option.text throws exceptions (#14686, #14858)
+					jQuery.trim( jQuery.text( elem ) );
+			}
+		},
 		select: {
 			get: function( elem ) {
 				var value, option,
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 4a9bb677e..7839abd85 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -1459,3 +1459,16 @@ test( "should not throw at $(option).val() (#14686)", 1, function() {
 		ok( false );
 	}
 });
+
+test( "Insignificant white space returned for $(option).val() (#14858)", function() {
+	expect ( 3 );
+
+	var val = jQuery( "<option></option>" ).val();
+	equal( val.length, 0, "Empty option should have no value" );
+
+	val = jQuery( "<option>  </option>" ).val();
+	equal( val.length, 0, "insignificant white-space returned for value" );
+
+	val = jQuery( "<option>  test  </option>" ).val();
+	equal( val.length, 4, "insignificant white-space returned for value" );
+});
-- 
2.39.5