diff options
author | Rick Waldron <waldron.rick@gmail.com> | 2012-12-31 13:23:26 -0500 |
---|---|---|
committer | Rick Waldron <waldron.rick@gmail.com> | 2012-12-31 13:23:26 -0500 |
commit | d50c18e61f1e498b21e64fd64f847463959061a1 (patch) | |
tree | 6b93e50228ed70288541bb7a054d53e98bde7306 /src/support.js | |
parent | d96fa37666ddd9b24a077bfccb6a9a532daea23c (diff) | |
download | jquery-d50c18e61f1e498b21e64fd64f847463959061a1.tar.gz jquery-d50c18e61f1e498b21e64fd64f847463959061a1.zip |
Resolved conflict
Diffstat (limited to 'src/support.js')
-rw-r--r-- | src/support.js | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/support.js b/src/support.js index 4c4b6ea77..9d8ed46da 100644 --- a/src/support.js +++ b/src/support.js @@ -5,7 +5,7 @@ jQuery.support = (function() { // Setup div.setAttribute( "className", "t" ); - div.innerHTML = " <link/><table></table><a href='/a'>a</a><input type='checkbox'/>"; + div.innerHTML = " <link/><table></table><a>a</a><input type='checkbox'/>"; // Support tests won't run in some limited or non-browser environments all = div.getElementsByTagName("*"); @@ -35,10 +35,6 @@ jQuery.support = (function() { // This requires a wrapper element in IE htmlSerialize: !!div.getElementsByTagName("link").length, - // Make sure that URLs aren't manipulated - // (IE normalizes it by default) - hrefNormalized: a.getAttribute("href") === "/a", - // Make sure that element opacity exists // (IE uses filter instead) // Use a regex to work around a WebKit issue. See #5145 |