http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61872
Revision: 61872
Author: catrope
Date: 2010-02-02 20:44:22 +0000 (Tue, 02 Feb 2010)
Log Message:
-----------
wmf-deployment: Merge r61700 (jQuery patch) from trunk
Modified Paths:
--------------
branches/wmf-deployment/skins/common/jquery.js
branches/wmf-deployment/skins/common/jquery.min.js
Property Changed:
----------------
branches/wmf-deployment/skins/common/
branches/wmf-deployment/skins/common/ajaxwatch.js
branches/wmf-deployment/skins/common/edit.js
branches/wmf-deployment/skins/common/jquery.js
branches/wmf-deployment/skins/common/jquery.min.js
Property changes on: branches/wmf-deployment/skins/common
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/skins/common:51646
/trunk/phase3/skins/common:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,59718,61557-61558
+ /branches/REL1_15/phase3/skins/common:51646
/trunk/phase3/skins/common:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,59718,61557-61558,61700
Property changes on: branches/wmf-deployment/skins/common/ajaxwatch.js
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/skins/common/ajaxwatch.js:51646
/trunk/phase3/skins/common/ajaxwatch.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,59680,59683,61557-61558
+ /branches/REL1_15/phase3/skins/common/ajaxwatch.js:51646
/trunk/phase3/skins/common/ajaxwatch.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,59680,59683,61557-61558,61700
Property changes on: branches/wmf-deployment/skins/common/edit.js
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/skins/common/edit.js:51646
/trunk/phase3/skins/common/edit.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,59604,59939,61557-61558
+ /branches/REL1_15/phase3/skins/common/edit.js:51646
/trunk/phase3/skins/common/edit.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,59604,59939,61557-61558,61700
Modified: branches/wmf-deployment/skins/common/jquery.js
===================================================================
--- branches/wmf-deployment/skins/common/jquery.js 2010-02-02 20:33:21 UTC
(rev 61871)
+++ branches/wmf-deployment/skins/common/jquery.js 2010-02-02 20:44:22 UTC
(rev 61872)
@@ -1059,7 +1059,7 @@
return letter.toUpperCase();
});
- if ( set && value != 'NaNpx' ) // Patched by Trevor, see
http://is.gd/5NXiD
+ if ( set && value != 'NaNpx' && value != 'nullpx' ) // Patched
by Trevor, see http://is.gd/5NXiD
elem[ name ] = value;
return elem[ name ];
Property changes on: branches/wmf-deployment/skins/common/jquery.js
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/phase3/skins/common/jquery.js:61558
+ /trunk/phase3/skins/common/jquery.js:61558,61700
Modified: branches/wmf-deployment/skins/common/jquery.min.js
===================================================================
--- branches/wmf-deployment/skins/common/jquery.min.js 2010-02-02 20:33:21 UTC
(rev 61871)
+++ branches/wmf-deployment/skins/common/jquery.min.js 2010-02-02 20:44:22 UTC
(rev 61872)
@@ -121,7 +121,7 @@
if(!jQuery.support.opacity&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+
(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}
return
elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}
-name=name.replace(/-([a-z])/ig,function(all,letter){return
letter.toUpperCase();});if(set&&value!='NaNpx')
+name=name.replace(/-([a-z])/ig,function(all,letter){return
letter.toUpperCase();});if(set&&value!='NaNpx'&&value!='nullpx')
elem[name]=value;return
elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var
ret=[];if(array!=null){var i=array.length;if(i==null||typeof
array==="string"||jQuery.isFunction(array)||array.setInterval)
ret[0]=array;else
while(i)
Property changes on: branches/wmf-deployment/skins/common/jquery.min.js
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/phase3/skins/common/jquery.min.js:61558
+ /trunk/phase3/skins/common/jquery.min.js:61558,61700
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
