Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319482
Change subject: Follow-up Id0021594: Remove extra code for redlink suggestions
......................................................................
Follow-up Id0021594: Remove extra code for redlink suggestions
We do a second query now instead which handles this by itself.
Move the description stuff to be generic for all redlinks
Bug: T149130
Change-Id: Iddc542d2aa02fd14a88014c78bd5a18e1f39f37e
(cherry picked from commit c2824fbb52c6210a4c4c5919e12782d455cdfce2)
---
M resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
1 file changed, 7 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/82/319482/1
diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
index 222586f..7ca19df 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
@@ -30,7 +30,6 @@
* @cfg {boolean} [relative=true] If a namespace is set, display titles
relative to it
* @cfg {boolean} [suggestions=true] Display search suggestions
* @cfg {boolean} [showRedirectTargets=true] Show the targets of
redirects
- * @cfg {boolean} [showRedlink] Show red link to exact match if it
doesn't exist
* @cfg {boolean} [showImages] Show page images
* @cfg {boolean} [showDescriptions] Show page descriptions
* @cfg {boolean} [excludeCurrentPage] Exclude the current page from
suggestions
@@ -52,7 +51,6 @@
this.relative = config.relative !== undefined ? config.relative
: true;
this.suggestions = config.suggestions !== undefined ?
config.suggestions : true;
this.showRedirectTargets = config.showRedirectTargets !== false;
- this.showRedlink = !!config.showRedlink;
this.showImages = !!config.showImages;
this.showDescriptions = !!config.showDescriptions;
this.excludeCurrentPage = !!config.excludeCurrentPage;
@@ -246,13 +244,6 @@
)
);
- if ( !pageExists ) {
- pageData[ this.getQueryValue() ] = {
- missing: true, known: false, redirect: false,
disambiguation: false,
- description: mw.msg(
'mw-widgets-titleinput-description-new-page' )
- };
- }
-
if ( this.cache ) {
this.cache.set( pageData );
}
@@ -261,10 +252,7 @@
if ( pageExists && !pageExistsExact ) {
titles.unshift( this.getQueryValue() );
}
- // Offer the exact text as a new page if the title is valid
- if ( this.showRedlink && !pageExists && titleObj ) {
- titles.push( this.getQueryValue() );
- }
+
for ( i = 0, len = titles.length; i < len; i++ ) {
page = pageData[ titles[ i ] ] || {};
items.push( new mw.widgets.TitleOptionWidget(
this.getOptionWidgetData( titles[ i ], page ) ) );
@@ -281,14 +269,18 @@
* @return {Object} Data for option widget
*/
mw.widgets.TitleWidget.prototype.getOptionWidgetData = function (
title, data ) {
- var mwTitle = new mw.Title( title );
+ var mwTitle = new mw.Title( title ),
+ description = data.description;
+ if ( data.missing && !description ) {
+ description = mw.msg(
'mw-widgets-titleinput-description-new-page' );
+ }
return {
data: this.namespace !== null && this.relative
? mwTitle.getRelativeText( this.namespace )
: title,
url: mwTitle.getUrl(),
imageUrl: this.showImages ? data.imageUrl : null,
- description: this.showDescriptions ? data.description :
null,
+ description: this.showDescriptions ? description : null,
missing: data.missing,
redirect: data.redirect,
disambiguation: data.disambiguation,
--
To view, visit https://gerrit.wikimedia.org/r/319482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddc542d2aa02fd14a88014c78bd5a18e1f39f37e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_28
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
