From: Ed Sanders <esanders@wikimedia.org>
Date: Sat, 30 Apr 2016 16:23:43 +0000 (+0100)
Subject: Give redirects a sort index in title widget
X-Git-Tag: 1.31.0-rc.0~7130^2
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=025ab458f67ef3ae0617f05115b24b75362d9938;p=lhc%2Fweb%2Fwiklou.git

Give redirects a sort index in title widget

Otherwise the sort compare function returns NaN
and the order is completely broken.

Bug: T134020
Change-Id: Ie3bbc153e6941d35cfab971690c8934123185d48
---

diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
index 3d9771116c..fdd4a8ae60 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
@@ -182,7 +182,7 @@
 				disambiguation: OO.getProp( suggestionPage, 'pageprops', 'disambiguation' ) !== undefined,
 				imageUrl: OO.getProp( suggestionPage, 'thumbnail', 'source' ),
 				description: OO.getProp( suggestionPage, 'terms', 'description' ),
-				// sort index
+				// Sort index
 				index: suggestionPage.index
 			};
 
@@ -198,7 +198,9 @@
 					missing: false,
 					redirect: true,
 					disambiguation: false,
-					description: mw.msg( 'mw-widgets-titleinput-description-redirect', suggestionPage.title )
+					description: mw.msg( 'mw-widgets-titleinput-description-redirect', suggestionPage.title ),
+					// Sort index, just below its target
+					index: suggestionPage.index + 0.5
 				};
 				titles.push( redirects[ i ] );
 			}