git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
21d59e8
)
Simplified some of the IE styleFloat/cssFloat code.
author
John Resig
<jeresig@gmail.com>
Sat, 30 Jun 2007 13:47:40 +0000
(13:47 +0000)
committer
John Resig
<jeresig@gmail.com>
Sat, 30 Jun 2007 13:47:40 +0000
(13:47 +0000)
src/jquery/jquery.js
patch
|
blob
|
history
diff --git
a/src/jquery/jquery.js
b/src/jquery/jquery.js
index
5940df3
..
ef728f0
100644
(file)
--- a/
src/jquery/jquery.js
+++ b/
src/jquery/jquery.js
@@
-1443,7
+1443,7
@@
jQuery.extend({
}
if (prop.match(/float/i))
}
if (prop.match(/float/i))
- prop = jQuery.browser.msie ? "styleFloat" : "cssFloat";
+ prop = jQuery.styleFloat;
if (!force && elem.style[prop])
ret = elem.style[prop];
if (!force && elem.style[prop])
ret = elem.style[prop];
@@
-1820,12
+1820,14
@@
new function() {
// Check to see if the W3C box model is being used
jQuery.boxModel = !jQuery.browser.msie || document.compatMode == "CSS1Compat";
// Check to see if the W3C box model is being used
jQuery.boxModel = !jQuery.browser.msie || document.compatMode == "CSS1Compat";
+ jQuery.styleFloat = jQuery.browser.msie ? "styleFloat" : "cssFloat",
+
jQuery.props = {
"for": "htmlFor",
"class": "className",
jQuery.props = {
"for": "htmlFor",
"class": "className",
- "float": jQuery.browser.msie ? "styleFloat" : "cssFloat",
- cssFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
- styleFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
+ "float": jQuery.styleFloat,
+ cssFloat: jQuery.styleFloat,
+ styleFloat: jQuery.styleFloat,
innerHTML: "innerHTML",
className: "className",
value: "value",
innerHTML: "innerHTML",
className: "className",
value: "value",