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

Added a fix for Safari's broken CSS getComputedStyle accessing. Additionally, added a fix for Safari mis-reporting @selected for display: none options. The test suite is now completely passing in Safari 3. (Bug #1349)

Browse source
This commit is contained in:
John Resig 2007-07-29 22:32:06 +00:00
parent 80a149b828
commit 3c82f8fb4a
2 changed files with 43 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/jquery/jquery.js vendored
View file

@ -1457,7 +1457,8 @@ jQuery.extend({
}, },
curCSS: function(elem, prop, force) { curCSS: function(elem, prop, force) {
var ret; var ret, getComputedStyle = document.defaultView &&
document.defaultView.getComputedStyle, stack = [], swap = [];
if (prop == "opacity" && jQuery.browser.msie) { if (prop == "opacity" && jQuery.browser.msie) {
ret = jQuery.attr(elem.style, "opacity"); ret = jQuery.attr(elem.style, "opacity");
@ -1470,27 +1471,52 @@ jQuery.extend({
if (!force && elem.style[prop]) if (!force && elem.style[prop])
ret = elem.style[prop]; ret = elem.style[prop];
else if (document.defaultView && document.defaultView.getComputedStyle) { else if (getComputedStyle) {
if (prop.match(/float/i)) if (prop.match(/float/i))
prop = "float"; prop = "float";
prop = prop.replace(/([A-Z])/g,"-$1").toLowerCase(); prop = prop.replace(/([A-Z])/g,"-$1").toLowerCase();
var cur = document.defaultView.getComputedStyle(elem, null); var cur = getComputedStyle(elem, null);
if ( cur ) if ( cur && !color(elem) )
ret = cur.getPropertyValue(prop); ret = cur.getPropertyValue(prop);
else if ( prop == "display" )
ret = "none"; // If the element isn't reporting its values properly in Safari
else // then some display: none elements are involved
jQuery.swap(elem, { display: "block" }, function() { else {
var c = document.defaultView.getComputedStyle(this, ""); // Locate all of the parent display: none elements
ret = c && c.getPropertyValue(prop) || ""; for ( var a = elem; color(a); a = a.parentNode )
}); stack.unshift(a);
// Go through and make them visible, but in reverse
// (It would be better if we knew the exact display type that they had)
for ( a = 0; a < stack.length; a++ )
if ( color(stack[a]) ) {
swap[a] = stack[a].style.display;
stack[a].style.display = "block";
}
// Since we flip the display style, we have to handle that
// one special, otherwise get the value
ret = prop == "display" && swap[stack.length-1] != null ?
"none" :
getComputedStyle(elem,null).getPropertyValue(prop) || "";
// Finally, revert the display styles back
for ( a = 0; a < swap.length; a++ )
if ( swap[a] != null )
stack[a].style.display = swap[a];
}
if ( prop == "opacity" && ret == "" ) if ( prop == "opacity" && ret == "" )
ret = "1"; ret = "1";
// A helper method for determining if an element's values are broken
function color(a){
return jQuery.browser.safari && getComputedStyle(a,null).getPropertyValue("color") == "";
}
} else if (elem.currentStyle) { } else if (elem.currentStyle) {
var newProp = prop.replace(/\-(\w)/g,function(m,c){return c.toUpperCase();}); var newProp = prop.replace(/\-(\w)/g,function(m,c){return c.toUpperCase();});
ret = elem.currentStyle[prop] || elem.currentStyle[newProp]; ret = elem.currentStyle[prop] || elem.currentStyle[newProp];
@ -1579,6 +1605,11 @@ jQuery.extend({
attr: function(elem, name, value){ attr: function(elem, name, value){
var fix = jQuery.isXMLDoc(elem) ? {} : jQuery.props; var fix = jQuery.isXMLDoc(elem) ? {} : jQuery.props;
// Safari mis-reports the default selected property of a hidden option
// Accessing the parent's selectedIndex property fixes it
if ( name == "selected" && jQuery.browser.safari )
elem.parentNode.selectedIndex;
// Certain attributes only work when accessed via the old DOM 0 way // Certain attributes only work when accessed via the old DOM 0 way
if ( fix[name] ) { if ( fix[name] ) {

2
src/selector/selector.js
View file

@ -339,7 +339,7 @@ jQuery.extend({
for ( var i = 0, rl = r.length; i < rl; i++ ) { for ( var i = 0, rl = r.length; i < rl; i++ ) {
var a = r[i], z = a[ jQuery.props[m[2]] || m[2] ]; var a = r[i], z = a[ jQuery.props[m[2]] || m[2] ];
if ( z == null || /href|src/.test(m[2]) ) if ( z == null || /href|src|selected/.test(m[2]) )
z = jQuery.attr(a,m[2]) || ''; z = jQuery.attr(a,m[2]) || '';
if ( (type == "" && !!z || if ( (type == "" && !!z ||