| Index: trunk/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.js |
| — | — | @@ -50,8 +50,9 @@ |
| 51 | 51 | 'line-height': '13px' |
| 52 | 52 | }) |
| 53 | 53 | .css( ( $j( 'body' ).is( '.rtl' ) ? 'right' : 'left' ), 0 ) |
| 54 | | - .click( function() { |
| | 54 | + .mousedown( function() { |
| 55 | 55 | $j(this).parent().find( 'input#searchInput' ).focus(); |
| | 56 | + return false; |
| 56 | 57 | }) |
| 57 | 58 | .appendTo( $j(this).parent() ); |
| 58 | 59 | if ( $j(this).val() == '' ) { |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php |
| — | — | @@ -17,13 +17,13 @@ |
| 18 | 18 | array( 'src' => 'Modules/ExpandableSearch/ExpandableSearch.js', 'version' => 5 ), |
| 19 | 19 | array( 'src' => 'Modules/EditWarning/EditWarning.js', 'version' => 9 ), |
| 20 | 20 | array( 'src' => 'Modules/FooterCleanup/FooterCleanup.js', 'version' => 5 ), |
| 21 | | - array( 'src' => 'Modules/SimpleSearch/SimpleSearch.js', 'version' => 18 ), |
| | 21 | + array( 'src' => 'Modules/SimpleSearch/SimpleSearch.js', 'version' => 19 ), |
| 22 | 22 | ), |
| 23 | 23 | 'combined' => array( |
| 24 | | - array( 'src' => 'Vector.combined.js', 'version' => 56 ), |
| | 24 | + array( 'src' => 'Vector.combined.js', 'version' => 57 ), |
| 25 | 25 | ), |
| 26 | 26 | 'minified' => array( |
| 27 | | - array( 'src' => 'Vector.combined.min.js', 'version' => 57 ), |
| | 27 | + array( 'src' => 'Vector.combined.min.js', 'version' => 58 ), |
| 28 | 28 | ), |
| 29 | 29 | ); |
| 30 | 30 | static $modules = array( |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js |
| — | — | @@ -555,8 +555,9 @@ |
| 556 | 556 | 'line-height': '13px' |
| 557 | 557 | }) |
| 558 | 558 | .css( ( $j( 'body' ).is( '.rtl' ) ? 'right' : 'left' ), 0 ) |
| 559 | | - .click( function() { |
| | 559 | + .mousedown( function() { |
| 560 | 560 | $j(this).parent().find( 'input#searchInput' ).focus(); |
| | 561 | + return false; |
| 561 | 562 | }) |
| 562 | 563 | .appendTo( $j(this).parent() ); |
| 563 | 564 | if ( $j(this).val() == '' ) { |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js |
| — | — | @@ -26,7 +26,7 @@ |
| 27 | 27 | +'</strong> other pages.</label>');$j('.mw-templatesUsedExplanation').remove();$j('.collapsible-list label').click(function(){$j(this).parent().toggleClass('expanded').toggleClass('collapsed').find('ul').slideToggle('fast');return false;}).trigger('click');$j('#wpPreview, #wpDiff, .editHelp, #editpage-specialchars').remove();$j('#mw-editform-cancel').remove().appendTo('.editButtons');});if(wgVectorEnabledModules.simplesearch&&skin=='vector'&&typeof os_autoload_inputs!=='undefined'&&os_autoload_forms!=='undefined'){os_autoload_inputs=[];os_autoload_forms=[];} |
| 28 | 28 | $j(document).ready(function(){if(!wgVectorEnabledModules.simplesearch||wgVectorPreferences.simplesearch.disablesuggest||skin!='vector'){return true;} |
| 29 | 29 | var mod={'browsers':{'ltr':{'opera':[['>=',9.6]],'blackberry':false,'ipod':false,'iphone':false},'rtl':{'opera':[['>=',9.6]],'blackberry':false,'ipod':false,'iphone':false}}};if(!$j.wikiEditor.isSupported(mod)){return true;} |
| 30 | | -$j('div#simpleSearch > input#searchInput').each(function(){$j('<label />').text(mw.usability.getMsg('vector-simplesearch-search')).css({'display':'none','position':'absolute','color':'#999999','cursor':'text','margin':'0 4px','top':'6px','line-height':'13px'}).css(($j('body').is('.rtl')?'right':'left'),0).click(function(){$j(this).parent().find('input#searchInput').focus();}).appendTo($j(this).parent());if($j(this).val()==''){$j(this).parent().find('label').fadeIn(100);}}).bind('keypress',function(){if($j(this).parent().find('label:visible').size()>0) |
| | 30 | +$j('div#simpleSearch > input#searchInput').each(function(){$j('<label />').text(mw.usability.getMsg('vector-simplesearch-search')).css({'display':'none','position':'absolute','color':'#999999','cursor':'text','margin':'0 4px','top':'6px','line-height':'13px'}).css(($j('body').is('.rtl')?'right':'left'),0).mousedown(function(){$j(this).parent().find('input#searchInput').focus();return false;}).appendTo($j(this).parent());if($j(this).val()==''){$j(this).parent().find('label').fadeIn(100);}}).bind('keypress',function(){if($j(this).parent().find('label:visible').size()>0) |
| 31 | 31 | $j(this).parent().find('label').fadeOut(100);}).focus(function(){$j(this).parent().find('label').fadeOut(100);}).blur(function(){if($j(this).val()==''){$j(this).parent().find('label').fadeIn(100);}});$j(document).bind('dragend',function(event){if($j('div#simpleSearch > label:visible').size()>0&&$j('div#simpleSearch > input#searchInput').val().length>0) |
| 32 | 32 | $j('div#simpleSearch > label').fadeOut(100);});$j('#searchInput, #searchInput2, #powerSearchText, #searchText').suggestions({fetch:function(query){var $this=$j(this);var request=$j.ajax({url:wgScriptPath+'/api.php',data:{'action':'opensearch','search':query,'namespace':0,'suggest':''},dataType:'json',success:function(data){$this.suggestions('suggestions',data[1]);}});$j(this).data('request',request);},cancel:function(){var request=$j(this).data('request');if(request&&typeof request.abort=='function'){request.abort();$j(this).removeData('request');}},result:{select:function($textbox){$textbox.closest('form').submit();}},delay:120,positionFromLeft:$j('body').is('.rtl'),highlightInput:true}).bind('paste cut click',function(){$j(this).trigger('keypress');});$j('#searchInput').suggestions({result:{select:function($textbox){$textbox.closest('form').submit();}},special:{render:function(query){if($j(this).children().size()==0){$j(this).show() |
| 33 | 33 | $label=$j('<div />').addClass('special-label').text(mw.usability.getMsg('vector-simplesearch-containing')).appendTo($j(this));$query=$j('<div />').addClass('special-query').text(query).appendTo($j(this));$query.autoEllipsis();}else{$j(this).find('.special-query').empty().text(query).autoEllipsis();}},select:function($textbox){$textbox.closest('form').append($j('<input />').attr({'type':'hidden','name':'fulltext','value':1}));$textbox.closest('form').submit();}},$region:$j('#simpleSearch')}).bind('paste cut click',function(){$j(this).trigger('keypress');});}); |
| \ No newline at end of file |
| Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -83,7 +83,7 @@ |
| 84 | 84 | array( 'src' => 'js/plugins.combined.js', 'version' => 436 ), |
| 85 | 85 | ), |
| 86 | 86 | 'minified' => array( |
| 87 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 438 ), |
| | 87 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 439 ), |
| 88 | 88 | ), |
| 89 | 89 | ), |
| 90 | 90 | ); |