diff options
| author | John Resig <jeresig@gmail.com> | 2010-08-23 12:38:55 -0700 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2010-08-23 12:38:55 -0700 |
| commit | 396dd2127330a7ed742d1e9092af54b668c46e85 (patch) | |
| tree | dbc55af2c1b18dee209f1d2d866e764e5b557a5d /test | |
| parent | 6f031c10157a2ca2265e0dbf684ef527d79afb56 (diff) | |
| download | jquery-396dd2127330a7ed742d1e9092af54b668c46e85.tar.gz jquery-396dd2127330a7ed742d1e9092af54b668c46e85.zip | |
Fixing getting/setting classes and makeArray(RegExp) for Blackberry 4.7. Fixes #6930, #6931.
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/core.js | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/test/unit/core.js b/test/unit/core.js index 5d6b9fe68..3960a7df9 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -258,21 +258,28 @@ test("isPlainObject", function() { // Window ok(!jQuery.isPlainObject(window), "window"); - - var iframe = document.createElement("iframe"); - document.body.appendChild(iframe); - window.iframeDone = function(otherObject){ - // Objects from other windows should be matched - ok(jQuery.isPlainObject(new otherObject), "new otherObject"); + try { + var iframe = document.createElement("iframe"); + document.body.appendChild(iframe); + + window.iframeDone = function(otherObject){ + // Objects from other windows should be matched + ok(jQuery.isPlainObject(new otherObject), "new otherObject"); + document.body.removeChild( iframe ); + start(); + }; + + var doc = iframe.contentDocument || iframe.contentWindow.document; + doc.open(); + doc.write("<body onload='window.parent.iframeDone(Object);'>"); + doc.close(); + } catch(e) { document.body.removeChild( iframe ); + + ok(true, "new otherObject - iframes not supported"); start(); - }; - - var doc = iframe.contentDocument || iframe.contentWindow.document; - doc.open(); - doc.write("<body onload='window.parent.iframeDone(Object);'>"); - doc.close(); + } }); test("isFunction", function() { @@ -374,9 +381,15 @@ test("isXMLDoc - HTML", function() { try { var body = jQuery(iframe).contents()[0]; - ok( !jQuery.isXMLDoc( body ), "Iframe body element" ); - } catch(e){ - ok( false, "Iframe body element exception" ); + + try { + ok( !jQuery.isXMLDoc( body ), "Iframe body element" ); + } catch(e) { + ok( false, "Iframe body element exception" ); + } + + } catch(e) { + ok( true, "Iframe body element - iframe not working correctly" ); } document.body.removeChild( iframe ); |