git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get actual values for attributes in IE and fix #910 so that it does not crash safari
[jquery.git]
/
src
/
jquery
/
jquery.js
diff --git
a/src/jquery/jquery.js
b/src/jquery/jquery.js
index
d9f5b8a
..
3693ee3
100644
(file)
--- a/
src/jquery/jquery.js
+++ b/
src/jquery/jquery.js
@@
-38,7
+38,7
@@
var jQuery = function(a,c) {
// Handle HTML strings
if ( typeof a == "string" ) {
// HANDLE: $(html) -> $(array)
// Handle HTML strings
if ( typeof a == "string" ) {
// HANDLE: $(html) -> $(array)
- var m = /^[^<]*(<(.|\n)+>)[^>]*$/.exec(a);
+ var m = /^[^<]*(<(.|\s)+>)[^>]*$/.exec(a);
if ( m )
a = jQuery.clean( [ m[1] ] );
if ( m )
a = jQuery.clean( [ m[1] ] );
@@
-257,9
+257,9
@@
jQuery.fn = jQuery.prototype = {
* @cat Core
*/
pushStack: function( a ) {
* @cat Core
*/
pushStack: function( a ) {
- var ret = jQuery(this);
+ var ret = jQuery(a);
ret.prevObject = this;
ret.prevObject = this;
- return ret.setArray( a );
+ return ret;
},
/**
},
/**
@@
-803,7
+803,7
@@
jQuery.fn = jQuery.prototype = {
find: function(t) {
return this.pushStack( jQuery.map( this, function(a){
return jQuery.find(t,a);
find: function(t) {
return this.pushStack( jQuery.map( this, function(a){
return jQuery.find(t,a);
- }) );
+ }), t );
},
/**
},
/**
@@
-1228,6
+1228,11
@@
jQuery.extend({
return !!fn && typeof fn != "string" &&
typeof fn[0] == "undefined" && /function/i.test( fn + "" );
},
return !!fn && typeof fn != "string" &&
typeof fn[0] == "undefined" && /function/i.test( fn + "" );
},
+
+ // check if an element is in a XML document
+ isXMLDoc: function(elem) {
+ return elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
+ },
nodeName: function( elem, name ) {
return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
nodeName: function( elem, name ) {
return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
@@
-1281,10
+1286,9
@@
jQuery.extend({
var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
// Handle passing in a number to a CSS property
var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
// Handle passing in a number to a CSS property
- if ( value.constructor == Number && type == "curCSS" && !exclude.test(prop) )
- return value + "px";
-
- return value;
+ return value && value.constructor == Number && type == "curCSS" && !exclude.test(prop) ?
+ value + "px" :
+ value;
},
className: {
},
className: {
@@
-1466,7
+1470,7
@@
jQuery.extend({
if ( arg.length === 0 )
return;
if ( arg.length === 0 )
return;
- if ( arg[0] == undefined )
+ if ( arg[0] == undefined || (jQuery.browser.msie && jQuery.nodeName(arg,"form")) )
r.push( arg );
else
r = jQuery.merge( r, arg );
r.push( arg );
else
r = jQuery.merge( r, arg );
@@
-1477,7
+1481,7
@@
jQuery.extend({
},
attr: function(elem, name, value){
},
attr: function(elem, name, value){
- var fix = {
+ var fix = jQuery.isXMLDoc(elem) ? {} : {
"for": "htmlFor",
"class": "className",
"float": jQuery.browser.msie ? "styleFloat" : "cssFloat",
"for": "htmlFor",
"class": "className",
"float": jQuery.browser.msie ? "styleFloat" : "cssFloat",
@@
-1491,6
+1495,8
@@
jQuery.extend({
selected: "selected"
};
selected: "selected"
};
+ var fixIE = jQuery.isXMLDoc(elem) ? [] : "href,src,background,cite,classid,codebase,data,longdesc,profile,usemap".split(',');
+
// IE actually uses filters for opacity ... elem is actually elem.style
if ( name == "opacity" && jQuery.browser.msie && value != undefined ) {
// IE has trouble with opacity if it does not have layout
// IE actually uses filters for opacity ... elem is actually elem.style
if ( name == "opacity" && jQuery.browser.msie && value != undefined ) {
// IE has trouble with opacity if it does not have layout
@@
-1508,6
+1514,7
@@
jQuery.extend({
// Mozilla doesn't play well with opacity 1
if ( name == "opacity" && jQuery.browser.mozilla && value == 1 )
value = 0.9999;
// Mozilla doesn't play well with opacity 1
if ( name == "opacity" && jQuery.browser.mozilla && value == 1 )
value = 0.9999;
+
// Certain attributes only work when accessed via the old DOM 0 way
if ( fix[name] ) {
// Certain attributes only work when accessed via the old DOM 0 way
if ( fix[name] ) {
@@
-1520,8
+1527,10
@@
jQuery.extend({
// IE elem.getAttribute passes even for style
else if ( elem.tagName ) {
if ( value != undefined ) elem.setAttribute( name, value );
// IE elem.getAttribute passes even for style
else if ( elem.tagName ) {
if ( value != undefined ) elem.setAttribute( name, value );
+ if ( jQuery.browser.msie && fixIE[name] ) return elem.getAttribute( name, 2 );
return elem.getAttribute( name );
return elem.getAttribute( name );
+ // elem is actually elem.style ... set the style
} else {
name = name.replace(/-([a-z])/ig,function(z,b){return b.toUpperCase();});
if ( value != undefined ) elem[name] = value;
} else {
name = name.replace(/-([a-z])/ig,function(z,b){return b.toUpperCase();});
if ( value != undefined ) elem[name] = value;