| 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' => 10 ), |
| | 68 | + array( 'src' => 'js/plugins/jquery.autoEllipsis.js', 'version' => 11 ), |
| 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' => 407 ), |
| | 88 | + array( 'src' => 'js/plugins.combined.js', 'version' => 408 ), |
| 89 | 89 | ), |
| 90 | 90 | 'minified' => array( |
| 91 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 407 ), |
| | 91 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 408 ), |
| 92 | 92 | ), |
| 93 | 93 | ), |
| 94 | 94 | ); |
| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins/jquery.autoEllipsis.js |
| — | — | @@ -38,6 +38,8 @@ |
| 39 | 39 | } |
| 40 | 40 | if ( w in cache[text] ) { |
| 41 | 41 | $text.text( cache[text][w] ); |
| | 42 | + if ( options.tooltip ) |
| | 43 | + $text.attr( 'title', text ); |
| 42 | 44 | return; |
| 43 | 45 | } |
| 44 | 46 | |
| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins.combined.js |
| — | — | @@ -5210,6 +5210,8 @@ |
| 5211 | 5211 | } |
| 5212 | 5212 | if ( w in cache[text] ) { |
| 5213 | 5213 | $text.text( cache[text][w] ); |
| | 5214 | + if ( options.tooltip ) |
| | 5215 | + $text.attr( 'title', text ); |
| 5214 | 5216 | return; |
| 5215 | 5217 | } |
| 5216 | 5218 | |
| Index: branches/wmf/1.16wmf4/extensions/UsabilityInitiative/js/plugins.combined.min.js |
| — | — | @@ -362,7 +362,8 @@ |
| 363 | 363 | {$.eachAsync(this,opts);return this;}})(jQuery);(function($){var cache={};$.fn.autoEllipsis=function(options){options=$.extend({'position':'center','tooltip':false,'restoreText':false,'hasSpan':false},options);$(this).each(function(){var $this=$(this);if(options.restoreText){if(!$this.data('autoEllipsis.originalText')){$this.data('autoEllipsis.originalText',$this.text());}else{$this.text($this.data('autoEllipsis.originalText'));}} |
| 364 | 364 | var text=$this.text();var w=$this.width();var $text;if(options.hasSpan){$text=$this.children('span');}else{$text=$('<span />').css('whiteSpace','nowrap');$this.empty().append($text);} |
| 365 | 365 | if(!(text in cache)){cache[text]={};} |
| 366 | | -if(w in cache[text]){$text.text(cache[text][w]);return;} |
| | 366 | +if(w in cache[text]){$text.text(cache[text][w]);if(options.tooltip) |
| | 367 | +$text.attr('title',text);return;} |
| 367 | 368 | $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 | 369 | break;case'left':var r=0;while($text.outerWidth()>w&&r<text.length){$text.text('...'+text.substr(r));r++;} |
| 369 | 370 | break;}} |
| Property changes on: branches/wmf/1.16wmf4/extensions/UsabilityInitiative |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 370 | 371 | - /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 |
| 371 | 372 | + /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,66728 |
| /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 |