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 /src | |
| 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 'src')
| -rw-r--r-- | src/attributes.js | 3 | ||||
| -rw-r--r-- | src/core.js | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/attributes.js b/src/attributes.js index aca9e055d..1278ff84b 100644 --- a/src/attributes.js +++ b/src/attributes.js @@ -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 ) { diff --git a/src/core.js b/src/core.js index e1a3a6df2..50ad55d94 100644 --- a/src/core.js +++ b/src/core.js @@ -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 ); |