From 0c2d1aee5421b650159116b6bdcb74a4fe96f9ad Mon Sep 17 00:00:00 2001 From: Rick Waldron Date: Sat, 30 Apr 2011 10:42:36 -0400 Subject: [PATCH] jQuery.buildFragment, ensure doc is a document; Includes comments; Adds unit test. Fixes #8950 --- src/manipulation.js | 21 +++++++++++++++++---- test/unit/manipulation.js | 11 ++++++++++- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/src/manipulation.js b/src/manipulation.js index 610d19b7..aeea083a 100644 --- a/src/manipulation.js +++ b/src/manipulation.js @@ -437,8 +437,21 @@ function cloneFixAttributes( src, dest ) { } jQuery.buildFragment = function( args, nodes, scripts ) { - var fragment, cacheable, cacheresults, - doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document); + var fragment, cacheable, cacheresults, doc; + + // nodes may contain either an explicit document object, + // a jQuery collection or context object. + // If nodes[0] contains a valid object to assign to doc + if ( nodes && nodes[0] ) { + doc = nodes[0].ownerDocument || nodes[0]; + } + + // Ensure that an attr object doesn't incorrectly stand in as a document object + // Chrome and Firefox seem to allow this to occur and will throw exception + // Fixes #8950 + if ( !doc.createDocumentFragment ) { + doc = document; + } // Only cache "small" (1/2 KB) HTML strings that are associated with the main document // Cloning options loses the selected state, so don't cache them @@ -500,7 +513,7 @@ jQuery.each({ function getAll( elem ) { if ( "getElementsByTagName" in elem ) { return elem.getElementsByTagName( "*" ); - + } else if ( "querySelectorAll" in elem ) { return elem.querySelectorAll( "*" ); @@ -746,4 +759,4 @@ function evalScript( i, elem ) { } } -})( jQuery ); +})( jQuery ); \ No newline at end of file diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js index b71b6962..a2b5c2e5 100644 --- a/test/unit/manipulation.js +++ b/test/unit/manipulation.js @@ -1382,6 +1382,15 @@ test("jQuery.buildFragment - no plain-text caching (Bug #6779)", function() { } catch(e) {} } - equals($f.text(), bad.join(""), "Cached strings that match Object properties"); + equals($f.text(), bad.join(""), "Cached strings that match Object properties"); $f.remove(); }); + +test("jQuery.buildFragment - plain objects are not a document #8950", function() { + expect(1); + + try { + jQuery('', {}); + ok( true, "Does not allow attribute object to be treated like a doc object"); + } catch (e) {} +});