Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
— | — | @@ -64,7 +64,7 @@ |
65 | 65 | |
66 | 66 | // Core functionality of extension scripts |
67 | 67 | array( 'src' => 'js/plugins/jquery.async.js', 'version' => 3 ), |
68 | | - array( 'src' => 'js/plugins/jquery.autoEllipsis.js', 'version' => 8 ), |
| 68 | + array( 'src' => 'js/plugins/jquery.autoEllipsis.js', 'version' => 10 ), |
69 | 69 | array( 'src' => 'js/plugins/jquery.browser.js', 'version' => 6 ), |
70 | 70 | array( 'src' => 'js/plugins/jquery.collapsibleTabs.js', 'version' => 6 ), |
71 | 71 | array( 'src' => 'js/plugins/jquery.color.js', 'version' => 1 ), |
— | — | @@ -84,10 +84,10 @@ |
85 | 85 | array( 'src' => 'js/plugins/jquery.wikiEditor.publish.js', 'version' => 5 ), |
86 | 86 | ), |
87 | 87 | 'combined' => array( |
88 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 402 ), |
| 88 | + array( 'src' => 'js/plugins.combined.js', 'version' => 407 ), |
89 | 89 | ), |
90 | 90 | 'minified' => array( |
91 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 402 ), |
| 91 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 407 ), |
92 | 92 | ), |
93 | 93 | ), |
94 | 94 | ); |
Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.autoEllipsis.js |
— | — | @@ -86,9 +86,9 @@ |
87 | 87 | } |
88 | 88 | break; |
89 | 89 | } |
90 | | - if ( options.tooltip ) |
91 | | - $text.attr( 'title', text ); |
92 | 90 | } |
| 91 | + if ( options.tooltip ) |
| 92 | + $text.attr( 'title', text ); |
93 | 93 | cache[text][w] = $text.text(); |
94 | 94 | } ); |
95 | 95 | }; |
Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins.combined.js |
— | — | @@ -5258,9 +5258,9 @@ |
5259 | 5259 | } |
5260 | 5260 | break; |
5261 | 5261 | } |
5262 | | - if ( options.tooltip ) |
5263 | | - $text.attr( 'title', text ); |
5264 | 5262 | } |
| 5263 | + if ( options.tooltip ) |
| 5264 | + $text.attr( 'title', text ); |
5265 | 5265 | cache[text][w] = $text.text(); |
5266 | 5266 | } ); |
5267 | 5267 | }; |
Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins.combined.min.js |
— | — | @@ -365,10 +365,9 @@ |
366 | 366 | if(w in cache[text]){$text.text(cache[text][w]);return;} |
367 | 367 | $text.text(text);if($text.width()>w){switch(options.position){case'right':var l=0,r=text.length;do{var m=Math.ceil((l+r)/2);$text.text(text.substr(0,m)+'...');if($text.width()>w){r=m-1;}else{l=m;}}while(l<r);$text.text(text.substr(0,l)+'...');break;case'center':var i=[Math.round(text.length/2),Math.round(text.length/2)];var side=1;while($text.outerWidth()>w&&i[0]>0){$text.text(text.substr(0,i[0])+'...'+text.substr(i[1]));if(side==0){i[0]--;side=1;}else{i[1]++;side=0;}} |
368 | 368 | break;case'left':var r=0;while($text.outerWidth()>w&&r<text.length){$text.text('...'+text.substr(r));r++;} |
369 | | -break;} |
| 369 | +break;}} |
370 | 370 | if(options.tooltip) |
371 | | -$text.attr('title',text);} |
372 | | -cache[text][w]=$text.text();});};})(jQuery);(function($){$.browserTest=function(a,z){var u='unknown',x='X',m=function(r,h){for(var i=0;i<h.length;i=i+1){r=r.replace(h[i][0],h[i][1]);} |
| 371 | +$text.attr('title',text);cache[text][w]=$text.text();});};})(jQuery);(function($){$.browserTest=function(a,z){var u='unknown',x='X',m=function(r,h){for(var i=0;i<h.length;i=i+1){r=r.replace(h[i][0],h[i][1]);} |
373 | 372 | return r;},c=function(i,a,b,c){var r={name:m((a.exec(i)||[u,u])[1],b)};r[r.name]=true;r.version=(c.exec(i)||[x,x,x,x])[3];if(r.name.match(/safari/)&&r.version>400){r.version='2.0';} |
374 | 373 | if(r.name==='presto'){r.version=($.browser.version>9.27)?'futhark':'linear_b';} |
375 | 374 | if(r.name==='opera'&&$.browser.version>=9.8){r.version=i.match(/version\/([0-9\.]*)/i)[1]||10;} |
Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative |
___________________________________________________________________ |
Name: svn:mergeinfo |
376 | 375 | - /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646 |
/branches/wmf-deployment/extensions/UsabilityInitiative:60970 |
/trunk/extensions/UsabilityInitiative:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66324,66331-66335,66402,66565,66623,66631,66642-66644,66655 |
/trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,65387,65391,65555,65590 |
377 | 376 | + /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646 |
/branches/wmf-deployment/extensions/UsabilityInitiative:60970 |
/trunk/extensions/UsabilityInitiative:56207,56209,56296,56333,56355,62041,62043,62127,62139,62142-62143,62145-62146,62256,62263,62266-63865,63867-63877,63879-64124,64129-64645,64647-64648,64650-66321,66324,66331-66335,66402,66565,66623,66631,66642-66644,66655,66725 |
/trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57541,57916,58151,58219,58633,58816,65387,65391,65555,65590 |