]> source.dussan.org Git - jquery.git/commitdiff
Ajax, Manipulation: don't test cross-document manip in Android 2.3 1572/head
authorMichał Gołębiowski <m.goleb@gmail.com>
Mon, 5 May 2014 13:45:57 +0000 (15:45 +0200)
committerMichał Gołębiowski <m.goleb@gmail.com>
Mon, 5 May 2014 13:45:57 +0000 (15:45 +0200)
test/unit/ajax.js
test/unit/manipulation.js

index 25397e85ec0992868d09a58ddf80475032ed4eae..a332c929c4ce670f69abd26e58064e33d8264f7c 100644 (file)
@@ -1470,6 +1470,12 @@ module( "ajax", {
                        var parsedXML = jQuery( jQuery.parseXML("<tab title=\"Added\">blibli</tab>") ).find("tab");
                        ajaxXML = jQuery( ajaxXML );
                        try {
+                               // Android 2.3 doesn't automatically adopt nodes from foreign documents.
+                               // (see the comment in test/manipulation.js)
+                               // Support: Android 2.3
+                               if ( /android 2\.3/i.test( navigator.userAgent ) ) {
+                                       parsedXML = jQuery( ajaxXML[ 0 ].adoptNode( parsedXML[ 0 ] ) );
+                               }
                                ajaxXML.find("infowindowtab").append( parsedXML );
                        } catch( e ) {
                                strictEqual( e, undefined, "error" );
index ac99654b9e7203cf96d1968a4a54cf29accfdb9e..057ddd56d287a906dcc9a86ecc8dada6660ee161 100644 (file)
@@ -409,7 +409,7 @@ test( "XML DOM manipulation (#9960)", function() {
 
        expect( 5 );
 
-       var
+       var scxml1Adopted,
                xmlDoc1 = jQuery.parseXML("<scxml xmlns='http://www.w3.org/2005/07/scxml' version='1.0'><state x='100' y='100' initial='actions' id='provisioning'></state><state x='100' y='100' id='error'></state><state x='100' y='100' id='finished' final='true'></state></scxml>"),
                xmlDoc2 = jQuery.parseXML("<scxml xmlns='http://www.w3.org/2005/07/scxml' version='1.0'><state id='provisioning3'></state></scxml>"),
                xml1 = jQuery( xmlDoc1 ),
@@ -418,6 +418,15 @@ test( "XML DOM manipulation (#9960)", function() {
                scxml2 = jQuery( "scxml", xml2 ),
                state = scxml2.find("state");
 
+       // Android 2.3 doesn't automatically adopt nodes from foreign documents.
+       // Although technically this is compliant behavior, no other browser
+       // (including newer Android Browsers) behave in this way so do the adopting
+       // just for Android 2.3.
+       // Support: Android 2.3
+       if ( /android 2\.3/i.test( navigator.userAgent ) ) {
+               state = jQuery( xmlDoc1.adoptNode( state[ 0 ] ) );
+       }
+
        scxml1.append( state );
        strictEqual( scxml1[0].lastChild, state[0], "append" );
 
@@ -430,7 +439,13 @@ test( "XML DOM manipulation (#9960)", function() {
        scxml1.find("#provisioning").before( state );
        strictEqual( scxml1[0].firstChild, state[0], "before" );
 
-       scxml2.replaceWith( scxml1 );
+       // Support: Android 2.3
+       if ( /android 2\.3/i.test( navigator.userAgent ) ) {
+               scxml1Adopted = jQuery( xmlDoc2.adoptNode( scxml1[ 0 ] ) );
+               scxml2.replaceWith( scxml1Adopted );
+       } else {
+               scxml2.replaceWith( scxml1 );
+       }
        deepEqual( jQuery( "state", xml2 ).get(), scxml1.find("state").get(), "replaceWith" );
 });