http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70117
Revision: 70117
Author: adam
Date: 2010-07-28 21:57:56 +0000 (Wed, 28 Jul 2010)
Log Message:
-----------
Fix for bug 24350
Modified Paths:
--------------
trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
trunk/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.js
trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js
trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js
trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php
trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
Modified: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-07-28 21:36:09 UTC (rev 70116)
+++ trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-07-28 21:57:56 UTC (rev 70117)
@@ -54,7 +54,7 @@
'base_sets' => array(
'raw' => array(
// Common UsabilityInitiative funtions
- array( 'src' => 'js/usability.js', 'version' =>
5 ),
+ array( 'src' => 'js/usability.js', 'version' =>
6 ),
// Core functionality of extension scripts
array( 'src' => 'js/plugins/jquery.async.js',
'version' => 3 ),
@@ -83,10 +83,10 @@
array( 'src' =>
'js/thirdparty/contentCollector.js', 'version' => 2 ),
),
'combined' => array(
- array( 'src' => 'js/plugins.combined.js',
'version' => 455 ),
+ array( 'src' => 'js/plugins.combined.js',
'version' => 456 ),
),
'minified' => array(
- array( 'src' => 'js/plugins.combined.min.js',
'version' => 476 ),
+ array( 'src' => 'js/plugins.combined.min.js',
'version' => 477 ),
),
),
);
Modified:
trunk/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.js
===================================================================
---
trunk/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.js
2010-07-28 21:36:09 UTC (rev 70116)
+++
trunk/extensions/UsabilityInitiative/Vector/Modules/SimpleSearch/SimpleSearch.js
2010-07-28 21:57:56 UTC (rev 70117)
@@ -9,7 +9,10 @@
$j(document).ready( function() {
// Only use this function in conjuction with the Vector skin
- if( !wgVectorEnabledModules.simplesearch ||
wgVectorPreferences.simplesearch.disablesuggest || skin != 'vector' ) {
+ if( !wgVectorEnabledModules.simplesearch ||
+ wgVectorPreferences.simplesearch.disablesuggest ||
+ !wgVectorPreferences.simplesearch.enable ||
+ skin != 'vector' ) {
return true;
}
var mod = {
Modified: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js
===================================================================
--- trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js
2010-07-28 21:36:09 UTC (rev 70116)
+++ trunk/extensions/UsabilityInitiative/Vector/Vector.combined.js
2010-07-28 21:57:56 UTC (rev 70117)
@@ -519,7 +519,10 @@
$j(document).ready( function() {
// Only use this function in conjuction with the Vector skin
- if( !wgVectorEnabledModules.simplesearch ||
wgVectorPreferences.simplesearch.disablesuggest || skin != 'vector' ) {
+ if( !wgVectorEnabledModules.simplesearch ||
+ wgVectorPreferences.simplesearch.disablesuggest ||
+ !wgVectorPreferences.simplesearch.enable ||
+ skin != 'vector' ) {
return true;
}
var mod = {
Modified: trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js
===================================================================
--- trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js
2010-07-28 21:36:09 UTC (rev 70116)
+++ trunk/extensions/UsabilityInitiative/Vector/Vector.combined.min.js
2010-07-28 21:57:56 UTC (rev 70117)
@@ -24,7 +24,7 @@
$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>'
+transclusionCount
+'</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=[];}
-$j(document).ready(function(){if(!wgVectorEnabledModules.simplesearch||wgVectorPreferences.simplesearch.disablesuggest||skin!='vector'){return
true;}
+$j(document).ready(function(){if(!wgVectorEnabledModules.simplesearch||wgVectorPreferences.simplesearch.disablesuggest||!wgVectorPreferences.simplesearch.enable||skin!='vector'){return
true;}
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;}
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');}});}
$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()
Modified: trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php
2010-07-28 21:36:09 UTC (rev 70116)
+++ trunk/extensions/UsabilityInitiative/Vector/Vector.hooks.php
2010-07-28 21:57:56 UTC (rev 70117)
@@ -17,13 +17,13 @@
array( 'src' =>
'Modules/ExpandableSearch/ExpandableSearch.js', 'version' => 5 ),
array( 'src' => 'Modules/EditWarning/EditWarning.js',
'version' => 10 ),
array( 'src' =>
'Modules/FooterCleanup/FooterCleanup.js', 'version' => 5 ),
- array( 'src' => 'Modules/SimpleSearch/SimpleSearch.js',
'version' => 25 ),
+ array( 'src' => 'Modules/SimpleSearch/SimpleSearch.js',
'version' => 26 ),
),
'combined' => array(
- array( 'src' => 'Vector.combined.js', 'version' => 69 ),
+ array( 'src' => 'Vector.combined.js', 'version' => 70 ),
),
'minified' => array(
- array( 'src' => 'Vector.combined.min.js', 'version' =>
70 ),
+ array( 'src' => 'Vector.combined.min.js', 'version' =>
71 ),
),
);
static $modules = array(
Modified: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
2010-07-28 21:36:09 UTC (rev 70116)
+++ trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
2010-07-28 21:57:56 UTC (rev 70117)
@@ -16,17 +16,17 @@
array( 'src' => 'Modules/Preview/Preview.js', 'version'
=> 9 ),
array( 'src' =>
'Modules/PreviewDialog/PreviewDialog.js', 'version' => 2 ),
array( 'src' => 'Modules/Publish/Publish.js', 'version'
=> 6 ),
- array( 'src' => 'Modules/Toc/Toc.js', 'version' => 9 ),
+ array( 'src' => 'Modules/Toc/Toc.js', 'version' => 10 ),
array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version'
=> 104 ),
array( 'src' =>
'Modules/TemplateEditor/TemplateEditor.js', 'version' => 6 ),
array( 'src' => 'Modules/Templates/Templates.js',
'version' => 1 ),
array( 'src' =>
'Modules/AddMediaWizard/AddMediaWizard.js', 'version' => 6 ),
),
'combined' => array(
- array( 'src' => 'WikiEditor.combined.js', 'version' =>
119 ),
+ array( 'src' => 'WikiEditor.combined.js', 'version' =>
120 ),
),
'minified' => array(
- array( 'src' => 'WikiEditor.combined.min.js', 'version'
=> 119 ),
+ array( 'src' => 'WikiEditor.combined.min.js', 'version'
=> 120 ),
),
);
static $messages = array(
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
