diff options
author | Oleg <markelog@gmail.com> | 2012-11-27 21:32:59 -0500 |
---|---|---|
committer | Dave Methvin <dave.methvin@gmail.com> | 2012-11-27 21:32:59 -0500 |
commit | 9ae6b1a019553e95a6205d5c42ff7fa25e7a482e (patch) | |
tree | 817caf8131b6b1c6ed0fb8fd01b6c2918293e2ba /src/manipulation.js | |
parent | 1052f9cb2bad094144fa1186b0be8f477a9d4fa1 (diff) | |
download | jquery-9ae6b1a019553e95a6205d5c42ff7fa25e7a482e.tar.gz jquery-9ae6b1a019553e95a6205d5c42ff7fa25e7a482e.zip |
Fix #12957. Simplify wrapMap, it doesn't need end tags. Close gh-1044.
Diffstat (limited to 'src/manipulation.js')
-rw-r--r-- | src/manipulation.js | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/manipulation.js b/src/manipulation.js index 6521e885e..f215d5a8c 100644 --- a/src/manipulation.js +++ b/src/manipulation.js @@ -30,18 +30,18 @@ var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figca rscriptTypeMasked = /^true\/(.*)/, rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g, wrapMap = { - option: [ 1, "<select multiple='multiple'>", "</select>" ], - legend: [ 1, "<fieldset>", "</fieldset>" ], - area: [ 1, "<map>", "</map>" ], - param: [ 1, "<object>", "</object>" ], - thead: [ 1, "<table>", "</table>" ], - tr: [ 2, "<table><tbody>", "</tbody></table>" ], - col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ], - td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ], + option: [ 1, "<select multiple='multiple'>" ], + legend: [ 1, "<fieldset>" ], + area: [ 1, "<map>" ], + param: [ 1, "<object>" ], + thead: [ 1, "<table>" ], + tr: [ 2, "<table><tbody>" ], + col: [ 2, "<table><tbody></tbody><colgroup>", "</table>" ], + td: [ 3, "<table><tbody><tr>" ], // IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags, // unless wrapped in a div with non-breaking characters in front of it. - _default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "" ] + _default: jQuery.support.htmlSerialize ? [ 0, "" ] : [ 1, "X<div>" ] }, safeFragment = createSafeFragment( document ), fragmentDiv = safeFragment.appendChild( document.createElement("div") ); @@ -713,7 +713,7 @@ jQuery.extend({ // Deserialize a standard representation tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase(); wrap = wrapMap[ tag ] || wrapMap._default; - tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2]; + tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + ( wrap[2] || "" ); // Descend through wrappers to the right content j = wrap[0]; |