dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bebde7c
)
partial fix for bug 35057 - backporting a patch from jQuery 1.7.2pre
author
Ryan Kaldari
<kaldari@users.mediawiki.org>
Fri, 16 Mar 2012 14:44:46 +0000
(14:44 +0000)
committer
Ryan Kaldari
<kaldari@users.mediawiki.org>
Fri, 16 Mar 2012 14:44:46 +0000
(14:44 +0000)
resources/jquery/jquery.js
patch
|
blob
|
history
diff --git
a/resources/jquery/jquery.js
b/resources/jquery/jquery.js
index
8ccd0ea
..
d7950ec
100644
(file)
--- a/
resources/jquery/jquery.js
+++ b/
resources/jquery/jquery.js
@@
-6447,6
+6447,7
@@
var ralpha = /alpha\([^)]*\)/i,
rupper = /([A-Z]|^ms)/g,
rnumpx = /^-?\d+(?:px)?$/i,
rnum = /^-?\d/,
+ rnumnonpx = /^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i,
rrelNum = /^([\-+])=([\-+.\de]+)/,
cssShow = { position: "absolute", visibility: "hidden", display: "block" },
@@
-6794,6
+6795,12
@@
function getWH( elem, name, extra ) {
if ( val < 0 || val == null ) {
val = elem.style[ name ] || 0;
}
+
+ // Computed unit is not pixels. Stop here and return.
+ if ( rnumnonpx.test(val) ) {
+ return val;
+ }
+
// Normalize "", auto, and prepare for extra
val = parseFloat( val ) || 0;