This commit is contained in:
parent
6f031c1015
commit
396dd21273
3 changed files with 33 additions and 18 deletions
|
@ -278,7 +278,8 @@ jQuery.extend({
|
|||
}
|
||||
|
||||
// If applicable, access the attribute via the DOM 0 way
|
||||
if ( name in elem && notxml && !special ) {
|
||||
// 'in' checks fail in Blackberry 4.7 #6931
|
||||
if ( (name in elem || elem[ name ] !== undefined) && notxml && !special ) {
|
||||
if ( set ) {
|
||||
// We can't allow the type property to be changed (since it causes problems in IE)
|
||||
if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
|
||||
|
|
|
@ -594,7 +594,8 @@ jQuery.extend({
|
|||
// The window, strings (and functions) also have 'length'
|
||||
// The extra typeof function check is to prevent crashes
|
||||
// in Safari 2 (See: #3039)
|
||||
if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || (typeof array !== "function" && array.setInterval) ) {
|
||||
// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
|
||||
if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || typeof array === "function" || typeof array.setInterval !== "undefined" ) {
|
||||
push.call( ret, array );
|
||||
} else {
|
||||
jQuery.merge( ret, array );
|
||||
|
|
|
@ -259,6 +259,7 @@ test("isPlainObject", function() {
|
|||
// Window
|
||||
ok(!jQuery.isPlainObject(window), "window");
|
||||
|
||||
try {
|
||||
var iframe = document.createElement("iframe");
|
||||
document.body.appendChild(iframe);
|
||||
|
||||
|
@ -273,6 +274,12 @@ test("isPlainObject", function() {
|
|||
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();
|
||||
}
|
||||
});
|
||||
|
||||
test("isFunction", function() {
|
||||
|
@ -374,11 +381,17 @@ test("isXMLDoc - HTML", function() {
|
|||
|
||||
try {
|
||||
var body = jQuery(iframe).contents()[0];
|
||||
|
||||
try {
|
||||
ok( !jQuery.isXMLDoc( body ), "Iframe body element" );
|
||||
} catch(e){
|
||||
} catch(e) {
|
||||
ok( false, "Iframe body element exception" );
|
||||
}
|
||||
|
||||
} catch(e) {
|
||||
ok( true, "Iframe body element - iframe not working correctly" );
|
||||
}
|
||||
|
||||
document.body.removeChild( iframe );
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in a new issue