https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114013
Revision: 114013
Author: kaldari
Date: 2012-03-16 14:44:46 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
partial fix for bug 35057 - backporting a patch from jQuery 1.7.2pre
Modified Paths:
--------------
trunk/phase3/resources/jquery/jquery.js
Modified: trunk/phase3/resources/jquery/jquery.js
===================================================================
--- trunk/phase3/resources/jquery/jquery.js 2012-03-16 14:39:52 UTC (rev
114012)
+++ trunk/phase3/resources/jquery/jquery.js 2012-03-16 14:44:46 UTC (rev
114013)
@@ -6447,6 +6447,7 @@
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 @@
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;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
