| Index: branches/wmf-deployment/skins/common/jquery.js |
| — | — | @@ -1059,7 +1059,7 @@ |
| 1060 | 1060 | return letter.toUpperCase(); |
| 1061 | 1061 | }); |
| 1062 | 1062 | |
| 1063 | | - if ( set && value != 'NaNpx' ) // Patched by Trevor, see http://is.gd/5NXiD |
| | 1063 | + if ( set && value != 'NaNpx' && value != 'nullpx' ) // Patched by Trevor, see http://is.gd/5NXiD |
| 1064 | 1064 | elem[ name ] = value; |
| 1065 | 1065 | |
| 1066 | 1066 | return elem[ name ]; |
| Property changes on: branches/wmf-deployment/skins/common/jquery.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1067 | 1067 | - /trunk/phase3/skins/common/jquery.js:61558 |
| 1068 | 1068 | + /trunk/phase3/skins/common/jquery.js:61558,61700 |
| Index: branches/wmf-deployment/skins/common/jquery.min.js |
| — | — | @@ -121,7 +121,7 @@ |
| 122 | 122 | if(!jQuery.support.opacity&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+ |
| 123 | 123 | (parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");} |
| 124 | 124 | return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";} |
| 125 | | -name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set&&value!='NaNpx') |
| | 125 | +name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set&&value!='NaNpx'&&value!='nullpx') |
| 126 | 126 | 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) |
| 127 | 127 | ret[0]=array;else |
| 128 | 128 | while(i) |
| Property changes on: branches/wmf-deployment/skins/common/jquery.min.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 129 | 129 | - /trunk/phase3/skins/common/jquery.min.js:61558 |
| 130 | 130 | + /trunk/phase3/skins/common/jquery.min.js:61558,61700 |
| Property changes on: branches/wmf-deployment/skins/common/ajaxwatch.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 131 | 131 | - /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 |
| 132 | 132 | + /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 |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 133 | 133 | - /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 |
| 134 | 134 | + /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 |
| Property changes on: branches/wmf-deployment/skins/common |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 135 | 135 | - /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 |
| 136 | 136 | + /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 |