Fix for #1198
This commit is contained in:
parent
108f308eaa
commit
33c097bd1e
1 changed files with 3 additions and 2 deletions
5
src/jquery/jquery.js
vendored
5
src/jquery/jquery.js
vendored
|
@ -1442,7 +1442,7 @@ jQuery.extend({
|
||||||
return ret == "" ? "1" : ret;
|
return ret == "" ? "1" : ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (prop == "float" || prop == "cssFloat")
|
if (prop.match(/float/i))
|
||||||
prop = jQuery.browser.msie ? "styleFloat" : "cssFloat";
|
prop = jQuery.browser.msie ? "styleFloat" : "cssFloat";
|
||||||
|
|
||||||
if (!force && elem.style[prop])
|
if (!force && elem.style[prop])
|
||||||
|
@ -1450,7 +1450,7 @@ jQuery.extend({
|
||||||
|
|
||||||
else if (document.defaultView && document.defaultView.getComputedStyle) {
|
else if (document.defaultView && document.defaultView.getComputedStyle) {
|
||||||
|
|
||||||
if (prop == "cssFloat" || prop == "styleFloat")
|
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();
|
||||||
|
@ -1558,6 +1558,7 @@ jQuery.extend({
|
||||||
"class": "className",
|
"class": "className",
|
||||||
"float": jQuery.browser.msie ? "styleFloat" : "cssFloat",
|
"float": jQuery.browser.msie ? "styleFloat" : "cssFloat",
|
||||||
cssFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
|
cssFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
|
||||||
|
styleFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
|
||||||
innerHTML: "innerHTML",
|
innerHTML: "innerHTML",
|
||||||
className: "className",
|
className: "className",
|
||||||
value: "value",
|
value: "value",
|
||||||
|
|
Loading…
Reference in a new issue