git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure that jQuery works even when the individual modules are loaded separately...
[jquery.git]
/
src
/
attributes.js
diff --git
a/src/attributes.js
b/src/attributes.js
index
4f7055a
..
73b4cdf
100644
(file)
--- a/
src/attributes.js
+++ b/
src/attributes.js
@@
-1,3
+1,5
@@
+(function( jQuery ) {
+
var rclass = /[\n\t]/g,
rspace = /\s+/,
rreturn = /\r/g,
var rclass = /[\n\t]/g,
rspace = /\s+/,
rreturn = /\r/g,
@@
-9,7
+11,7
@@
var rclass = /[\n\t]/g,
jQuery.fn.extend({
attr: function( name, value ) {
jQuery.fn.extend({
attr: function( name, value ) {
- return access( this, name, value, true, jQuery.attr );
+ return jQuery.access( this, name, value, true, jQuery.attr );
},
removeAttr: function( name, fn ) {
},
removeAttr: function( name, fn ) {
@@
-139,7
+141,10
@@
jQuery.fn.extend({
if ( elem ) {
if ( jQuery.nodeName( elem, "option" ) ) {
if ( elem ) {
if ( jQuery.nodeName( elem, "option" ) ) {
- return (elem.attributes.value || {}).specified ? elem.value : elem.text;
+ // attributes.value is undefined in Blackberry 4.7 but
+ // uses .value. See #6932
+ var val = elem.attributes.value;
+ return !val || val.specified ? elem.value : elem.text;
}
// We need to handle select boxes special
}
// We need to handle select boxes special
@@
-278,7
+283,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 ) {
// 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 ( 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 ) {
@@
-321,6
+327,12
@@
jQuery.extend({
elem.setAttribute( name, "" + value );
}
elem.setAttribute( name, "" + value );
}
+ // Ensure that missing attributes return undefined
+ // Blackberry 4.7 returns "" from getAttribute #6938
+ if ( !elem.attributes[ name ] && !elem.hasAttribute( name ) ) {
+ return undefined;
+ }
+
var attr = !jQuery.support.hrefNormalized && notxml && special ?
// Some attributes require a special call on IE
elem.getAttribute( name, 2 ) :
var attr = !jQuery.support.hrefNormalized && notxml && special ?
// Some attributes require a special call on IE
elem.getAttribute( name, 2 ) :
@@
-335,3
+347,5
@@
jQuery.extend({
return jQuery.style( elem, name, value );
}
});
return jQuery.style( elem, name, value );
}
});
+
+})( jQuery );