| Index: trunk/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.js |
| — | — | @@ -9,7 +9,10 @@ |
| 10 | 10 | |
| 11 | 11 | $j(document).ready( function() { |
| 12 | 12 | // Only use this function in conjuction with the Vector skin |
| 13 | | - if( !wgVectorEnabledModules.simplesearch || wgVectorPreferences.simplesearch.disablesuggest || skin != 'vector' ) { |
| | 13 | + if( !wgVectorEnabledModules.simplesearch || |
| | 14 | + wgVectorPreferences.simplesearch.disablesuggest || |
| | 15 | + !wgVectorPreferences.simplesearch.enable || |
| | 16 | + skin != 'vector' ) { |
| 14 | 17 | return true; |
| 15 | 18 | } |
| 16 | 19 | var mod = { |
| 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' => 10 ), |
| 20 | 20 | array( 'src' => 'Modules/FooterCleanup/FooterCleanup.js', 'version' => 5 ), |
| 21 | | - array( 'src' => 'Modules/SimpleSearch/SimpleSearch.js', 'version' => 25 ), |
| | 21 | + array( 'src' => 'Modules/SimpleSearch/SimpleSearch.js', 'version' => 26 ), |
| 22 | 22 | ), |
| 23 | 23 | 'combined' => array( |
| 24 | | - array( 'src' => 'Vector.combined.js', 'version' => 69 ), |
| | 24 | + array( 'src' => 'Vector.combined.js', 'version' => 70 ), |
| 25 | 25 | ), |
| 26 | 26 | 'minified' => array( |
| 27 | | - array( 'src' => 'Vector.combined.min.js', 'version' => 70 ), |
| | 27 | + array( 'src' => 'Vector.combined.min.js', 'version' => 71 ), |
| 28 | 28 | ), |
| 29 | 29 | ); |
| 30 | 30 | static $modules = array( |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js |
| — | — | @@ -519,7 +519,10 @@ |
| 520 | 520 | |
| 521 | 521 | $j(document).ready( function() { |
| 522 | 522 | // Only use this function in conjuction with the Vector skin |
| 523 | | - if( !wgVectorEnabledModules.simplesearch || wgVectorPreferences.simplesearch.disablesuggest || skin != 'vector' ) { |
| | 523 | + if( !wgVectorEnabledModules.simplesearch || |
| | 524 | + wgVectorPreferences.simplesearch.disablesuggest || |
| | 525 | + !wgVectorPreferences.simplesearch.enable || |
| | 526 | + skin != 'vector' ) { |
| 524 | 527 | return true; |
| 525 | 528 | } |
| 526 | 529 | var mod = { |
| Index: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js |
| — | — | @@ -24,7 +24,7 @@ |
| 25 | 25 | $j('#editpage-copywarn').add('.editOptions').wrapAll('<div id="editpage-bottom"></div>');$j('#wpSummary').data('hint',$j('#wpSummaryLabel span small').remove().text().replace(/\)|\(/g,'')).change(function(){if($j(this).val().length==0){$j(this).addClass('inline-hint').val($j(this).data('hint'));}else{$j(this).removeClass('inline-hint');}}).focus(function(){if($j(this).val()==$j(this).data('hint')){$j(this).removeClass('inline-hint').val("");}}).blur(function(){$j(this).trigger('change');}).trigger('change');$j('#wpSummary').add('.editCheckboxes').wrapAll('<div id="editpage-summary-fields"></div>');$j('#editpage-specialchars').remove();var transclusionCount=$j('.templatesUsed ul li').size();$j('.templatesUsed ul').wrap('<div id="transclusions-list" class="collapsible-list collapsed"></div>').parent().prepend('<label>This page contains <a href="http://en.wikipedia.org/wiki/transclusion">transclusions</a> of <strong>' |
| 26 | 26 | +transclusionCount |
| 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 | | -$j(document).ready(function(){if(!wgVectorEnabledModules.simplesearch||wgVectorPreferences.simplesearch.disablesuggest||skin!='vector'){return true;} |
| | 28 | +$j(document).ready(function(){if(!wgVectorEnabledModules.simplesearch||wgVectorPreferences.simplesearch.disablesuggest||!wgVectorPreferences.simplesearch.enable||skin!='vector'){return true;} |
| 29 | 29 | var mod={'browsers':{'ltr':{'opera':[['>=',9.6]],'docomo':false,'blackberry':false,'ipod':false,'iphone':false},'rtl':{'opera':[['>=',9.6]],'docomo':false,'blackberry':false,'ipod':false,'iphone':false}}};if(!$j.wikiEditor.isSupported(mod)){return true;} |
| 30 | 30 | if('placeholder'in document.createElement('input')){$j('div#simpleSearch > input#searchInput').attr('placeholder',mw.usability.getMsg('vector-simplesearch-search'));}else{$j('div#simpleSearch > input#searchInput').each(function(){var $input=$j(this);$input.bind('blur',function(){if($input.val().length==0){$input.val(mw.usability.getMsg('vector-simplesearch-search')).addClass('placeholder');}}).bind('focus',function(){if($input.hasClass('placeholder')){$input.val('').removeClass('placeholder');}}).parents('form').bind('submit',function(){$input.trigger('focus');});if($input.val()==''){$input.trigger('blur');}});} |
| 31 | 31 | $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',function(e){$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() |
| Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php |
| — | — | @@ -54,7 +54,7 @@ |
| 55 | 55 | 'base_sets' => array( |
| 56 | 56 | 'raw' => array( |
| 57 | 57 | // Common UsabilityInitiative funtions |
| 58 | | - array( 'src' => 'js/usability.js', 'version' => 5 ), |
| | 58 | + array( 'src' => 'js/usability.js', 'version' => 6 ), |
| 59 | 59 | |
| 60 | 60 | // Core functionality of extension scripts |
| 61 | 61 | array( 'src' => 'js/plugins/jquery.async.js', 'version' => 3 ), |
| — | — | @@ -83,10 +83,10 @@ |
| 84 | 84 | array( 'src' => 'js/thirdparty/contentCollector.js', 'version' => 2 ), |
| 85 | 85 | ), |
| 86 | 86 | 'combined' => array( |
| 87 | | - array( 'src' => 'js/plugins.combined.js', 'version' => 455 ), |
| | 87 | + array( 'src' => 'js/plugins.combined.js', 'version' => 456 ), |
| 88 | 88 | ), |
| 89 | 89 | 'minified' => array( |
| 90 | | - array( 'src' => 'js/plugins.combined.min.js', 'version' => 476 ), |
| | 90 | + array( 'src' => 'js/plugins.combined.min.js', 'version' => 477 ), |
| 91 | 91 | ), |
| 92 | 92 | ), |
| 93 | 93 | ); |
| Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php |
| — | — | @@ -16,17 +16,17 @@ |
| 17 | 17 | array( 'src' => 'Modules/Preview/Preview.js', 'version' => 9 ), |
| 18 | 18 | array( 'src' => 'Modules/PreviewDialog/PreviewDialog.js', 'version' => 2 ), |
| 19 | 19 | array( 'src' => 'Modules/Publish/Publish.js', 'version' => 6 ), |
| 20 | | - array( 'src' => 'Modules/Toc/Toc.js', 'version' => 9 ), |
| | 20 | + array( 'src' => 'Modules/Toc/Toc.js', 'version' => 10 ), |
| 21 | 21 | array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version' => 104 ), |
| 22 | 22 | array( 'src' => 'Modules/TemplateEditor/TemplateEditor.js', 'version' => 6 ), |
| 23 | 23 | array( 'src' => 'Modules/Templates/Templates.js', 'version' => 1 ), |
| 24 | 24 | array( 'src' => 'Modules/AddMediaWizard/AddMediaWizard.js', 'version' => 6 ), |
| 25 | 25 | ), |
| 26 | 26 | 'combined' => array( |
| 27 | | - array( 'src' => 'WikiEditor.combined.js', 'version' => 119 ), |
| | 27 | + array( 'src' => 'WikiEditor.combined.js', 'version' => 120 ), |
| 28 | 28 | ), |
| 29 | 29 | 'minified' => array( |
| 30 | | - array( 'src' => 'WikiEditor.combined.min.js', 'version' => 119 ), |
| | 30 | + array( 'src' => 'WikiEditor.combined.min.js', 'version' => 120 ), |
| 31 | 31 | ), |
| 32 | 32 | ); |
| 33 | 33 | static $messages = array( |