deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixing getting/setting classes and makeArray(RegExp) for Blackberry 4.7. Fixes #6930, #6931.

Browse source
This commit is contained in:
John Resig 2010-08-23 12:38:55 -07:00
parent 6f031c1015
commit 396dd21273
3 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/attributes.js
View file

@ -278,7 +278,8 @@ jQuery.extend({
} }
// If applicable, access the attribute via the DOM 0 way // 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 ) { if ( set ) {
// We can't allow the type property to be changed (since it causes problems in IE) // 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 ) { if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {

3
src/core.js
View file

@ -594,7 +594,8 @@ jQuery.extend({
// The window, strings (and functions) also have 'length' // The window, strings (and functions) also have 'length'
// The extra typeof function check is to prevent crashes // The extra typeof function check is to prevent crashes
// in Safari 2 (See: #3039) // 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 ); push.call( ret, array );
} else { } else {
jQuery.merge( ret, array ); jQuery.merge( ret, array );

41
test/unit/core.js
View file

@ -259,20 +259,27 @@ test("isPlainObject", function() {
// Window // Window
ok(!jQuery.isPlainObject(window), "window"); ok(!jQuery.isPlainObject(window), "window");
var iframe = document.createElement("iframe"); try {
document.body.appendChild(iframe); var iframe = document.createElement("iframe");
document.body.appendChild(iframe);
window.iframeDone = function(otherObject){ window.iframeDone = function(otherObject){
// Objects from other windows should be matched // Objects from other windows should be matched
ok(jQuery.isPlainObject(new otherObject), "new otherObject"); 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 ); document.body.removeChild( iframe );
start();
};
var doc = iframe.contentDocument || iframe.contentWindow.document; ok(true, "new otherObject - iframes not supported");
doc.open(); start();
doc.write("<body onload='window.parent.iframeDone(Object);'>"); }
doc.close();
}); });
test("isFunction", function() { test("isFunction", function() {
@ -374,9 +381,15 @@ test("isXMLDoc - HTML", function() {
try { try {
var body = jQuery(iframe).contents()[0]; var body = jQuery(iframe).contents()[0];
ok( !jQuery.isXMLDoc( body ), "Iframe body element" );
} catch(e){ try {
ok( false, "Iframe body element exception" ); 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 ); document.body.removeChild( iframe );