Skip to content
Permalink
Browse files

Added a fix and test for bug #978 (Appending elements into an IFrame,…

… in IE).
  • Loading branch information
jeresig committed Mar 24, 2007
1 parent 7ad613c commit 0f7c89cd97de6ca644a834a119dda1e057fd724e
Showing with 28 additions and 10 deletions.
  1. +1 −0 build/test/index.html
  2. +11 −1 src/jquery/coreTest.js
  3. +14 −7 src/jquery/jquery.js
  4. +2 −2 src/selector/selectorTest.js
@@ -79,6 +79,7 @@ <h2 id="userAgent"></h2>
</object>
</form>
<b id="floatTest">Float test.</b>
<iframe id="iframe"></iframe>
</div>
</dl>

@@ -316,7 +316,7 @@ test("wrap(String|Element)", function() {
});

test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
expect(11);
expect(12);
var defaultText = 'Try them out:'
var result = $('#first').append('<b>buga</b>');
ok( result.text() == defaultText + 'buga', 'Check if text appending works' );
@@ -353,6 +353,16 @@ test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
reset();
$("#sap").append(document.getElementById('form'));
ok( $("#sap>form").size() == 1, "Check for appending a form" ); // Bug #910

reset();
var pass = true;
try {
$( $("iframe")[0].contentWindow.document.body ).append("<div>test</div>");
} catch(e) {
pass = false;
}

ok( pass, "Test for appending a DOM node to the contents of an IFrame" );

});

@@ -614,10 +614,13 @@ jQuery.fn = jQuery.prototype = {
*/
wrap: function() {
// The elements to wrap the target around
var a = jQuery.clean(arguments);
var a, args = arguments;

// Wrap each of the matched elements individually
return this.each(function(){
if ( !a )
a = jQuery.clean(args, this.ownerDocument);

// Clone the structure that we're using to wrap
var b = a[0].cloneNode(true);

@@ -1121,12 +1124,15 @@ jQuery.fn = jQuery.prototype = {
* @cat Core
*/
domManip: function(args, table, dir, fn){
var clone = this.length > 1;
var a = jQuery.clean(args);
if ( dir < 0 )
a.reverse();
var clone = this.length > 1, a;

return this.each(function(){
if ( !a ) {
a = jQuery.clean(args, this.ownerDocument);
if ( dir < 0 )
a.reverse();
}

var obj = this;

if ( table && jQuery.nodeName(this, "table") && jQuery.nodeName(a[0], "tr") )
@@ -1440,8 +1446,9 @@ jQuery.extend({
return ret;
},

clean: function(a) {
clean: function(a, doc) {
var r = [];
doc = doc || document;

jQuery.each( a, function(i,arg){
if ( !arg ) return;
@@ -1452,7 +1459,7 @@ jQuery.extend({
// Convert html string into DOM nodes
if ( typeof arg == "string" ) {
// Trim whitespace, otherwise indexOf won't work as expected
var s = jQuery.trim(arg), div = document.createElement("div"), tb = [];
var s = jQuery.trim(arg), div = doc.createElement("div"), tb = [];

var wrap =
// option or optgroup
@@ -144,8 +144,8 @@ test("expressions - basic xpath", function() {
t( "Attribute Exists", "//a[@title]", ["google"] );
t( "Attribute Equals", "//a[@rel='bookmark']", ["simon1"] );
t( "Parent Axis", "//p/..", ["main","foo"] );
t( "Sibling Axis", "//p/../", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","sndp","en","sap"] );
t( "Sibling Axis", "//p/../*", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","sndp","en","sap"] );
t( "Sibling Axis", "//p/../", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","iframe","sndp","en","sap"] );
t( "Sibling Axis", "//p/../*", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","iframe","sndp","en","sap"] );
t( "Has Children", "//p[a]", ["firstp","ap","en","sap"] );

$("#foo").each(function() {

0 comments on commit 0f7c89c

Please sign in to comment.
You can’t perform that action at this time.