From 25e87732f8e36b9004071368e0bcc1298b6677e9 Mon Sep 17 00:00:00 2001 From: Ed Sanders Date: Tue, 3 Oct 2017 15:52:13 +0100 Subject: [PATCH] TitleOptionWidget: Don't show an icon when showImages=false Change-Id: Ib4262bc15a3845ec9e7af484dbdfa4277f2f4014 --- .../src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js | 7 +++++-- resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js b/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js index 0f1815b004..638f461ba7 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js @@ -16,6 +16,7 @@ * @param {Object} config Configuration options * @cfg {string} data Label to display * @cfg {string} url URL of page + * @cfg {boolean} [showImages] Whether to attempt to show images * @cfg {string} [imageUrl] Thumbnail image URL with URL encoding * @cfg {string} [description] Page description * @cfg {boolean} [missing] Page doesn't exist @@ -26,7 +27,9 @@ mw.widgets.TitleOptionWidget = function MwWidgetsTitleOptionWidget( config ) { var icon; - if ( config.missing ) { + if ( !config.showImages ) { + icon = null; + } else if ( config.missing ) { icon = 'page-not-found'; } else if ( config.redirect ) { icon = 'page-redirect'; @@ -78,7 +81,7 @@ this.$label.addClass( 'mw-disambig' ); } - if ( config.imageUrl ) { + if ( config.showImages && config.imageUrl ) { this.$icon .addClass( 'mw-widget-titleOptionWidget-hasImage' ) .css( 'background-image', 'url(' + config.imageUrl + ')' ); diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js index 8e7afd7f19..5fe094ff63 100644 --- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js +++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js @@ -329,6 +329,7 @@ mwTitle.getRelativeText( this.namespace ) : title, url: mwTitle.getUrl(), + showImages: this.showImages, imageUrl: this.showImages ? data.imageUrl : null, description: this.showDescriptions ? description : null, missing: data.missing, -- 2.20.1