http://www.mediawiki.org/wiki/Special:Code/MediaWiki/66307
Revision: 66307
Author: adam
Date: 2010-05-12 21:45:31 +0000 (Wed, 12 May 2010)
Log Message:
-----------
Fixing bug 23492
Modified Paths:
--------------
trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
trunk/extensions/UsabilityInitiative/js/plugins/jquery.suggestions.js
trunk/extensions/UsabilityInitiative/js/plugins.combined.js
trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
Modified: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
===================================================================
--- trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-05-12 21:37:27 UTC (rev 66306)
+++ trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
2010-05-12 21:45:31 UTC (rev 66307)
@@ -70,7 +70,7 @@
array( 'src' => 'js/plugins/jquery.color.js',
'version' => 1 ),
array( 'src' => 'js/plugins/jquery.cookie.js',
'version' => 4 ),
array( 'src' =>
'js/plugins/jquery.delayedBind.js', 'version' => 1 ),
- array( 'src' =>
'js/plugins/jquery.suggestions.js', 'version' => 13 ),
+ array( 'src' =>
'js/plugins/jquery.suggestions.js', 'version' => 14 ),
array( 'src' =>
'js/plugins/jquery.textSelection.js', 'version' => 32 ),
array( 'src' =>
'js/plugins/jquery.wikiEditor.js', 'version' => 187 ),
array( 'src' =>
'js/plugins/jquery.wikiEditor.highlight.js', 'version' => 53 ),
@@ -83,10 +83,10 @@
array( 'src' =>
'js/plugins/jquery.wikiEditor.publish.js', 'version' => 5 ),
),
'combined' => array(
- array( 'src' => 'js/plugins.combined.js',
'version' => 393 ),
+ array( 'src' => 'js/plugins.combined.js',
'version' => 394 ),
),
'minified' => array(
- array( 'src' => 'js/plugins.combined.min.js',
'version' => 393 ),
+ array( 'src' => 'js/plugins.combined.min.js',
'version' => 394 ),
),
),
);
Modified: trunk/extensions/UsabilityInitiative/js/plugins/jquery.suggestions.js
===================================================================
--- trunk/extensions/UsabilityInitiative/js/plugins/jquery.suggestions.js
2010-05-12 21:37:27 UTC (rev 66306)
+++ trunk/extensions/UsabilityInitiative/js/plugins/jquery.suggestions.js
2010-05-12 21:45:31 UTC (rev 66307)
@@ -257,7 +257,7 @@
case 13:
context.data.$container.hide();
preventDefault = wasVisible;
- selected = context.data.$container.find(
'.suggestions-result-current' )
+ selected = context.data.$container.find(
'.suggestions-result-current' );
if ( selected.is( '.suggestions-special' ) ) {
if ( typeof
context.config.special.select == 'function' ) {
context.config.special.select.call( selected, context.data.$textbox );
@@ -266,6 +266,8 @@
if ( typeof
context.config.result.select == 'function' ) {
$.suggestions.highlight(
context, selected, true );
context.config.result.select.call( selected, context.data.$textbox );
+ } else {
+ $.suggestions.highlight(
context, selected, true );
}
}
break;
Modified: trunk/extensions/UsabilityInitiative/js/plugins.combined.js
===================================================================
--- trunk/extensions/UsabilityInitiative/js/plugins.combined.js 2010-05-12
21:37:27 UTC (rev 66306)
+++ trunk/extensions/UsabilityInitiative/js/plugins.combined.js 2010-05-12
21:45:31 UTC (rev 66307)
@@ -6008,7 +6008,7 @@
case 13:
context.data.$container.hide();
preventDefault = wasVisible;
- selected = context.data.$container.find(
'.suggestions-result-current' )
+ selected = context.data.$container.find(
'.suggestions-result-current' );
if ( selected.is( '.suggestions-special' ) ) {
if ( typeof
context.config.special.select == 'function' ) {
context.config.special.select.call( selected, context.data.$textbox );
@@ -6017,6 +6017,8 @@
if ( typeof
context.config.result.select == 'function' ) {
$.suggestions.highlight(
context, selected, true );
context.config.result.select.call( selected, context.data.$textbox );
+ } else {
+ $.suggestions.highlight(
context, selected, true );
}
}
break;
Modified: trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
===================================================================
--- trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
2010-05-12 21:37:27 UTC (rev 66306)
+++ trunk/extensions/UsabilityInitiative/js/plugins.combined.min.js
2010-05-12 21:45:31 UTC (rev 66307)
@@ -401,8 +401,7 @@
context.data.$textbox.trigger('change');}
$.suggestions.special(context);},keypress:function(e,context,key){var
wasVisible=context.data.$container.is(':visible');var
preventDefault=false;switch(key){case
40:if(wasVisible){$.suggestions.highlight(context,'next',false);}else{$.suggestions.update(context,false);}
preventDefault=true;break;case
38:if(wasVisible){$.suggestions.highlight(context,'prev',false);}
-preventDefault=wasVisible;break;case
27:context.data.$container.hide();$.suggestions.restore(context);$.suggestions.cancel(context);context.data.$textbox.trigger('change');preventDefault=wasVisible;break;case
13:context.data.$container.hide();preventDefault=wasVisible;selected=context.data.$container.find('.suggestions-result-current')
-if(selected.is('.suggestions-special')){if(typeof
context.config.special.select=='function'){context.config.special.select.call(selected,context.data.$textbox);}}else{if(typeof
context.config.result.select=='function'){$.suggestions.highlight(context,selected,true);context.config.result.select.call(selected,context.data.$textbox);}}
+preventDefault=wasVisible;break;case
27:context.data.$container.hide();$.suggestions.restore(context);$.suggestions.cancel(context);context.data.$textbox.trigger('change');preventDefault=wasVisible;break;case
13:context.data.$container.hide();preventDefault=wasVisible;selected=context.data.$container.find('.suggestions-result-current');if(selected.is('.suggestions-special')){if(typeof
context.config.special.select=='function'){context.config.special.select.call(selected,context.data.$textbox);}}else{if(typeof
context.config.result.select=='function'){$.suggestions.highlight(context,selected,true);context.config.result.select.call(selected,context.data.$textbox);}else{$.suggestions.highlight(context,selected,true);}}
break;default:$.suggestions.update(context,true);break;}
if(preventDefault){e.preventDefault();e.stopImmediatePropagation();}}};$.fn.suggestions=function(){var
returnValue=null;var args=arguments;$(this).each(function(){var
context=$(this).data('suggestions-context');if(typeof
context=='undefined'){context={config:{'fetch':function(){},'cancel':function(){},'special':{},'result':{},'$region':$(this),'suggestions':[],'maxRows':7,'delay':120,'submitOnClick':false}};}
if(args.length>0){if(typeof args[0]=='object'){for(var key in
args[0]){$.suggestions.configure(context,key,args[0][key]);}}else if(typeof
args[0]=='string'){if(args.length>1){$.suggestions.configure(context,args[0],args[1]);}else
if(returnValue==null){returnValue=(args[0]in
context.config?undefined:context.config[args[0]]);}}}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
