jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (c8201dd) ......................................................................
Update VE core submodule to master (c8201dd) New changes: ff237d4 Fix z-indexes in core e88d43e Localisation updates from https://translatewiki.net. cf61803 Consistently use ve.ui.WindowManager everywhere f9dfdb8 Update OOjs UI to v0.1.0-pre (23565e7519) f79f7e3 Update OOjs UI to v0.1.0-pre (8f8896196f) c8201dd Update OOjs UI to v0.1.0-pre (9ed4cf2557) Local changes for the breaking change to OptionWidget and sub-classes. Change-Id: Ife6abd312d4dc97be67cb84eea4cb9c6a0a31b1d --- M lib/ve M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js M modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js M modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js M modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkMenuOptionWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWLinkMenuOptionWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWMediaResultWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWMoreParametersResultWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWNoParametersResultWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWParameterResultWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWParameterSearchWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWReferenceGroupInputWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWReferenceResultWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js 18 files changed, 173 insertions(+), 138 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ve b/lib/ve index fb57e24..c8201dd 160000 --- a/lib/ve +++ b/lib/ve -Subproject commit fb57e2441744897f9370235b5f5cfa1df120638b +Subproject commit c8201dddc99334481ef939606753c283dc69c3ed diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js index ed52c70..f96700a 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js @@ -268,18 +268,21 @@ $: this.$ } ); - alignLeftButton = new OO.ui.ButtonOptionWidget( 'left', { + alignLeftButton = new OO.ui.ButtonOptionWidget( { $: this.$, + data: 'left', icon: 'align-float-left', label: ve.msg( 'visualeditor-dialog-media-position-left' ) } ); - alignCenterButton = new OO.ui.ButtonOptionWidget( 'center', { + alignCenterButton = new OO.ui.ButtonOptionWidget( { $: this.$, + data: 'center', icon: 'align-center', label: ve.msg( 'visualeditor-dialog-media-position-center' ) } ); - alignRightButton = new OO.ui.ButtonOptionWidget( 'right', { + alignRightButton = new OO.ui.ButtonOptionWidget( { $: this.$, + data: 'right', icon: 'align-float-right', label: ve.msg( 'visualeditor-dialog-media-position-right' ) } ); @@ -323,23 +326,27 @@ } ); this.typeSelect.addItems( [ // TODO: Inline images require a bit of further work, will be coming soon - new OO.ui.ButtonOptionWidget( 'thumb', { + new OO.ui.ButtonOptionWidget( { $: this.$, + data: 'thumb', icon: 'image-thumbnail', label: ve.msg( 'visualeditor-dialog-media-type-thumb' ) } ), - new OO.ui.ButtonOptionWidget( 'frameless', { + new OO.ui.ButtonOptionWidget( { $: this.$, + data: 'frameless', icon: 'image-frameless', label: ve.msg( 'visualeditor-dialog-media-type-frameless' ) } ), - new OO.ui.ButtonOptionWidget( 'frame', { + new OO.ui.ButtonOptionWidget( { $: this.$, + data: 'frame', icon: 'image-frame', label: ve.msg( 'visualeditor-dialog-media-type-frame' ) } ), - new OO.ui.ButtonOptionWidget( 'none', { + new OO.ui.ButtonOptionWidget( { $: this.$, + data: 'none', icon: 'image-none', label: ve.msg( 'visualeditor-dialog-media-type-none' ) } ) diff --git a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js index e358b12..fc1d91f 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js @@ -38,18 +38,18 @@ this.indexing = new OO.ui.FieldLayout( new OO.ui.ButtonSelectWidget( { $: this.$ } ) .addItems( [ - new OO.ui.ButtonOptionWidget( - 'mwIndexForce', - { label: ve.msg( 'visualeditor-dialog-meta-settings-index-force' ) } - ), - new OO.ui.ButtonOptionWidget( - 'default', - { label: ve.msg( 'visualeditor-dialog-meta-settings-index-default' ) } - ), - new OO.ui.ButtonOptionWidget( - 'mwIndexDisable', - { label: ve.msg( 'visualeditor-dialog-meta-settings-index-disable' ) } - ) + new OO.ui.ButtonOptionWidget( { + data: 'mwIndexForce', + label: ve.msg( 'visualeditor-dialog-meta-settings-index-force' ) + } ), + new OO.ui.ButtonOptionWidget( { + data: 'default', + label: ve.msg( 'visualeditor-dialog-meta-settings-index-default' ) + } ), + new OO.ui.ButtonOptionWidget( { + data: 'mwIndexDisable', + label: ve.msg( 'visualeditor-dialog-meta-settings-index-disable' ) + } ) ] ) .connect( this, { select: 'onIndexingOptionChange' } ), { @@ -64,18 +64,18 @@ this.newEditSectionLink = new OO.ui.FieldLayout( new OO.ui.ButtonSelectWidget( { $: this.$ } ) .addItems( [ - new OO.ui.ButtonOptionWidget( - 'mwNewSectionEditForce', - { label: ve.msg( 'visualeditor-dialog-meta-settings-newsectioneditlink-force' ) } - ), - new OO.ui.ButtonOptionWidget( - 'default', - { label: ve.msg( 'visualeditor-dialog-meta-settings-newsectioneditlink-default' ) } - ), - new OO.ui.ButtonOptionWidget( - 'mwNewSectionEditDisable', - { label: ve.msg( 'visualeditor-dialog-meta-settings-newsectioneditlink-disable' ) } - ) + new OO.ui.ButtonOptionWidget( { + data: 'mwNewSectionEditForce', + label: ve.msg( 'visualeditor-dialog-meta-settings-newsectioneditlink-force' ) + } ), + new OO.ui.ButtonOptionWidget( { + data: 'default', + label: ve.msg( 'visualeditor-dialog-meta-settings-newsectioneditlink-default' ) + } ), + new OO.ui.ButtonOptionWidget( { + data: 'mwNewSectionEditDisable', + label: ve.msg( 'visualeditor-dialog-meta-settings-newsectioneditlink-disable' ) + } ) ] ) .connect( this, { select: 'onNewSectionEditLinkOptionChange' } ), { diff --git a/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js b/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js index 918cd31..e1666b0 100644 --- a/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js +++ b/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js @@ -41,18 +41,18 @@ this.tableOfContents = new OO.ui.FieldLayout( new OO.ui.ButtonSelectWidget( { $: this.$ } ) .addItems( [ - new OO.ui.ButtonOptionWidget( - 'mwTOCForce', - { label: ve.msg( 'visualeditor-dialog-meta-settings-toc-force' ) } - ), - new OO.ui.ButtonOptionWidget( - 'default', - { label: ve.msg( 'visualeditor-dialog-meta-settings-toc-default' ) } - ), - new OO.ui.ButtonOptionWidget( - 'mwTOCDisable', - { label: ve.msg( 'visualeditor-dialog-meta-settings-toc-disable' ) } - ) + new OO.ui.ButtonOptionWidget( { + data: 'mwTOCForce', + label: ve.msg( 'visualeditor-dialog-meta-settings-toc-force' ) + } ), + new OO.ui.ButtonOptionWidget( { + data: 'default', + label: ve.msg( 'visualeditor-dialog-meta-settings-toc-default' ) + } ), + new OO.ui.ButtonOptionWidget( { + data: 'mwTOCDisable', + label: ve.msg( 'visualeditor-dialog-meta-settings-toc-disable' ) + } ) ] ) .connect( this, { select: 'onTableOfContentsFieldChange' } ), { diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js index 9257951..b82fd13 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js @@ -172,9 +172,11 @@ } ], function ( index, sectionData ) { if ( sectionData.items.length ) { - itemWidgets.push( new OO.ui.MenuSectionOptionWidget( - sectionData.id, { $: this.lookupMenu.$, label: sectionData.label } - ) ); + itemWidgets.push( new OO.ui.MenuSectionOptionWidget( { + $: this.lookupMenu.$, + data: sectionData.id, + label: sectionData.label + } ) ); $.each( sectionData.items, function ( index, categoryItem ) { itemWidgets.push( this.getCategoryWidgetFromName( categoryItem ) ); }.bind( this ) ); @@ -196,8 +198,9 @@ mw.Title.newFromText( name, mw.config.get( 'wgNamespaceIds' ).category ).getPrefixedText() ); if ( cachedData && cachedData.redirectFrom ) { - return new OO.ui.MenuOptionWidget( name, { + return new OO.ui.MenuOptionWidget( { $: this.lookupMenu.$, + data: name, autoFitLabel: false, label: this.$( '<span>' ) .text( mw.Title.newFromText( cachedData.redirectFrom[0] ).getMainText() ) @@ -205,7 +208,11 @@ .append( this.$( '<span>' ).text( mw.Title.newFromText( name ).getMainText() ) ) } ); } else { - return new OO.ui.MenuOptionWidget( name, { $: this.lookupMenu.$, label: name } ); + return new OO.ui.MenuOptionWidget( { + $: this.lookupMenu.$, + data: name, + label: name + } ); } }; diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkMenuOptionWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkMenuOptionWidget.js index a98bf00..0467f97 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkMenuOptionWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkMenuOptionWidget.js @@ -1,5 +1,5 @@ /*! - * VisualEditor UserInterface MWLinkMenuOptionWidget class + * VisualEditor UserInterface MWInternalLinkMenuOptionWidget class * * @copyright 2011-2014 VisualEditor Team and others; see http://ve.mit-license.org */ @@ -11,11 +11,10 @@ * @extends ve.ui.MWLinkMenuOptionWidget * * @constructor - * @param {Mixed} data Item data * @param {Object} [config] Configuration options * @cfg {string} [pagename] Pagename to return the names of internal pages */ -ve.ui.MWInternalLinkMenuOptionWidget = function VeUiMWInternalLinkMenuOptionWidget( data, config ) { +ve.ui.MWInternalLinkMenuOptionWidget = function VeUiMWInternalLinkMenuOptionWidget( config ) { // Config initialization config = config || {}; @@ -23,7 +22,7 @@ this.pagename = config.pagename; // Parent constructor - ve.ui.MWLinkMenuOptionWidget.call( this, data, $.extend( { label: this.pagename, href: mw.util.getUrl( this.pagename ) }, config ) ); + ve.ui.MWLinkMenuOptionWidget.call( this, $.extend( { label: this.pagename, href: mw.util.getUrl( this.pagename ) }, config ) ); // Style based on link cache information ve.init.platform.linkCache.styleElement( this.pagename, this.$link ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWLinkMenuOptionWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWLinkMenuOptionWidget.js index 42e8d0a..a51876b 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWLinkMenuOptionWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWLinkMenuOptionWidget.js @@ -11,16 +11,15 @@ * @extends OO.ui.MenuOptionWidget * * @constructor - * @param {Mixed} data Item data * @param {Object} [config] Configuration options * @cfg {string} [href] href to point to pages from link suggestions */ -ve.ui.MWLinkMenuOptionWidget = function VeUiMWLinkMenuOptionWidget( data, config ) { +ve.ui.MWLinkMenuOptionWidget = function VeUiMWLinkMenuOptionWidget( config ) { // Config initialization config = config || {}; // Parent constructor - ve.ui.MWLinkMenuOptionWidget.super.call( this, data, config ); + ve.ui.MWLinkMenuOptionWidget.super.call( this, config ); // initialization this.$label.wrap( '<a>' ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js index 2393946..f91d890 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js @@ -178,33 +178,40 @@ // External link if ( ve.init.platform.getExternalLinkUrlProtocolsRegExp().test( this.value ) ) { - items.push( new OO.ui.MenuSectionOptionWidget( - 'externalLink', - { $: menu$, label: ve.msg( 'visualeditor-linkinspector-suggest-external-link' ) } - ) ); - items.push( new ve.ui.MWLinkMenuOptionWidget( - this.getExternalLinkAnnotationFromUrl( this.value ), - { $: menu$, classes: [ 've-ui-mwLinkTargetInputWidget-extlink' ], label: this.value, href: this.value } - ) ); + items.push( new OO.ui.MenuSectionOptionWidget( { + $: menu$, + data: 'externalLink', + label: ve.msg( 'visualeditor-linkinspector-suggest-external-link' ) + } ) ); + items.push( new ve.ui.MWLinkMenuOptionWidget( { + $: menu$, + data: this.getExternalLinkAnnotationFromUrl( this.value ), + classes: [ 've-ui-mwLinkTargetInputWidget-extlink' ], + label: this.value, + href: this.value + } ) ); } // Internal link if ( !pageExists ) { if ( titleObj ) { - items.push( new OO.ui.MenuSectionOptionWidget( - 'newPage', - { $: menu$, label: ve.msg( 'visualeditor-linkinspector-suggest-new-page' ) } - ) ); - items.push( new ve.ui.MWInternalLinkMenuOptionWidget( - this.getInternalLinkAnnotationFromTitle( this.value ), - { $: menu$, pagename: this.value } - ) ); + items.push( new OO.ui.MenuSectionOptionWidget( { + $: menu$, + data: 'newPage', + label: ve.msg( 'visualeditor-linkinspector-suggest-new-page' ) + } ) ); + items.push( new ve.ui.MWInternalLinkMenuOptionWidget( { + $: menu$, + data: this.getInternalLinkAnnotationFromTitle( this.value ), + pagename: this.value + } ) ); } else { // If no title object could be created, it means the title is illegal - item = new OO.ui.MenuSectionOptionWidget( - 'illegalTitle', - { $: menu$, label: ve.msg( 'visualeditor-linkinspector-illegal-title' ) } - ); + item = new OO.ui.MenuSectionOptionWidget( { + $: menu$, + data: 'illegalTitle', + label: ve.msg( 'visualeditor-linkinspector-illegal-title' ) + } ); item.$element.addClass( 've-ui-mwLinkTargetInputWidget-warning' ); items.push( item ); } @@ -212,47 +219,55 @@ // Matching pages if ( matchingPages && matchingPages.length ) { - items.push( new OO.ui.MenuSectionOptionWidget( - 'matchingPages', - { $: menu$, label: ve.msg( 'visualeditor-linkinspector-suggest-matching-page', matchingPages.length ) } - ) ); + items.push( new OO.ui.MenuSectionOptionWidget( { + $: menu$, + data: 'matchingPages', + label: ve.msg( 'visualeditor-linkinspector-suggest-matching-page', + matchingPages.length ) + } ) ); // Offer the exact text as a suggestion if the page exists if ( pageExists && !pageExistsExact ) { matchingPages.unshift( this.value ); } for ( i = 0, len = matchingPages.length; i < len; i++ ) { - items.push( new ve.ui.MWInternalLinkMenuOptionWidget( - this.getInternalLinkAnnotationFromTitle( matchingPages[i] ), - { $: menu$, pagename: matchingPages[i] } - ) ); + items.push( new ve.ui.MWInternalLinkMenuOptionWidget( { + $: menu$, + data: this.getInternalLinkAnnotationFromTitle( matchingPages[i] ), + pagename: matchingPages[i] + } ) ); } } // Disambiguation pages if ( disambigPages.length ) { - items.push( new OO.ui.MenuSectionOptionWidget( - 'disambigPages', - { $: menu$, label: ve.msg( 'visualeditor-linkinspector-suggest-disambig-page', disambigPages.length ) } - ) ); + items.push( new OO.ui.MenuSectionOptionWidget( { + $: menu$, + data: 'disambigPages', + label: ve.msg( 'visualeditor-linkinspector-suggest-disambig-page', disambigPages.length ) + } ) ); for ( i = 0, len = disambigPages.length; i < len; i++ ) { - items.push( new ve.ui.MWInternalLinkMenuOptionWidget( - this.getInternalLinkAnnotationFromTitle( disambigPages[i] ), - { $: menu$, pagename: disambigPages[i] } - ) ); + items.push( new ve.ui.MWInternalLinkMenuOptionWidget( { + $: menu$, + data: this.getInternalLinkAnnotationFromTitle( disambigPages[i] ), + pagename: disambigPages[i] + } ) ); } } // Redirect pages if ( redirectPages.length ) { - items.push( new OO.ui.MenuSectionOptionWidget( - 'redirectPages', - { $: menu$, label: ve.msg( 'visualeditor-linkinspector-suggest-redirect-page', redirectPages.length ) } - ) ); + items.push( new OO.ui.MenuSectionOptionWidget( { + $: menu$, + data: 'redirectPages', + label: ve.msg( 'visualeditor-linkinspector-suggest-redirect-page', redirectPages.length ) + } ) ); for ( i = 0, len = redirectPages.length; i < len; i++ ) { - items.push( new OO.ui.MenuOptionWidget( - this.getInternalLinkAnnotationFromTitle( redirectPages[i] ), - { $: menu$, rel: 'redirectPage', label: redirectPages[i] } - ) ); + items.push( new OO.ui.MenuOptionWidget( { + $: menu$, + data: this.getInternalLinkAnnotationFromTitle( redirectPages[i] ), + rel: 'redirectPage', + label: redirectPages[i] + } ) ); } } diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWMediaResultWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWMediaResultWidget.js index eaa55af..f57af7b 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWMediaResultWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWMediaResultWidget.js @@ -12,16 +12,15 @@ * @extends OO.ui.OptionWidget * * @constructor - * @param {Mixed} data Item data * @param {Object} [config] Configuration options * @cfg {number} [size] Media thumbnail size */ -ve.ui.MWMediaResultWidget = function VeUiMWMediaResultWidget( data, config ) { +ve.ui.MWMediaResultWidget = function VeUiMWMediaResultWidget( config ) { // Configuration initialization config = config || {}; // Parent constructor - OO.ui.OptionWidget.call( this, data, config ); + OO.ui.OptionWidget.call( this, config ); // Properties this.size = config.size || 150; diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js index 14e122a..c8ceb2d 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js @@ -229,10 +229,11 @@ if ( !Object.prototype.hasOwnProperty.call( this.titles, title ) ) { this.titles[title] = true; items.push( - new ve.ui.MWMediaResultWidget( - pages[page], - { $: this.$, size: this.size } - ) + new ve.ui.MWMediaResultWidget( { + $: this.$, + data: pages[page], + size: this.size + } ) ); } } diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWMoreParametersResultWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWMoreParametersResultWidget.js index f577c78..ca9ed81 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWMoreParametersResultWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWMoreParametersResultWidget.js @@ -12,16 +12,16 @@ * @extends OO.ui.DecoratedOptionWidget * * @constructor - * @param {Mixed} data Item data - * @param {number} [data.remainder] Remaining items that can be shown * @param {Object} [config] Configuration options + * @param {Mixed} [config.data] Item data + * @param {number} [config.data.remainder] Remaining items that can be shown */ -ve.ui.MWMoreParametersResultWidget = function VeUiMWMoreParametersResultWidget( data, config ) { +ve.ui.MWMoreParametersResultWidget = function VeUiMWMoreParametersResultWidget( config ) { // Configuration initialization config = ve.extendObject( { icon: 'parameter-set' }, config ); // Parent constructor - OO.ui.DecoratedOptionWidget.call( this, data, config ); + OO.ui.DecoratedOptionWidget.call( this, config ); // Initialization this.$element.addClass( 've-ui-mwMoreParametersResultWidget' ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWNoParametersResultWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWNoParametersResultWidget.js index fb5cb49..6393539 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWNoParametersResultWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWNoParametersResultWidget.js @@ -12,12 +12,11 @@ * @extends OO.ui.OptionWidget * * @constructor - * @param {Mixed} data Item data * @param {Object} [config] Configuration options */ -ve.ui.MWNoParametersResultWidget = function VeUiMWNoParametersResultWidget( data, config ) { +ve.ui.MWNoParametersResultWidget = function VeUiMWNoParametersResultWidget( config ) { // Parent constructor - OO.ui.OptionWidget.call( this, data, config ); + OO.ui.OptionWidget.call( this, config ); // Initialization this.$element.addClass( 've-ui-mwNoParametersResultWidget' ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWParameterResultWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWParameterResultWidget.js index 7fa162d..519c304 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWParameterResultWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWParameterResultWidget.js @@ -12,15 +12,14 @@ * @extends OO.ui.DecoratedOptionWidget * * @constructor - * @param {Mixed} data Item data * @param {Object} [config] Configuration options */ -ve.ui.MWParameterResultWidget = function VeUiMWParameterResultWidget( data, config ) { +ve.ui.MWParameterResultWidget = function VeUiMWParameterResultWidget( config ) { // Configuration initialization config = ve.extendObject( { icon: 'parameter' }, config ); // Parent constructor - OO.ui.DecoratedOptionWidget.call( this, data, config ); + OO.ui.DecoratedOptionWidget.call( this, config ); // Initialization this.$element.addClass( 've-ui-mwParameterResultWidget' ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWParameterSearchWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWParameterSearchWidget.js index 388813a..ac09fa8 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWParameterSearchWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWParameterSearchWidget.js @@ -143,7 +143,7 @@ nameMatch = item.names.indexOf( query ) >= 0; } if ( !hasQuery || textMatch || nameMatch ) { - items.push( new ve.ui.MWParameterResultWidget( item, { $: this.$ } ) ); + items.push( new ve.ui.MWParameterResultWidget( { $: this.$, data: item } ) ); if ( hasQuery && nameMatch ) { exactMatch = true; } @@ -156,21 +156,27 @@ if ( hasQuery && !exactMatch && value.length && !this.template.hasParameter( value ) ) { items.unshift( new ve.ui.MWParameterResultWidget( { - name: value, - label: value, - aliases: [], - description: ve.msg( 'visualeditor-parameter-search-unknown' ) - }, { $: this.$ } ) ); + $: this.$, + data: { + name: value, + label: value, + aliases: [], + description: ve.msg( 'visualeditor-parameter-search-unknown' ) + } + } ) ); } if ( !items.length ) { - items.push( new ve.ui.MWNoParametersResultWidget( - {}, { $: this.$, disabled: true } - ) ); + items.push( new ve.ui.MWNoParametersResultWidget( { + $: this.$, + data: {}, + disabled: true + } ) ); } else if ( remainder ) { - items.push( new ve.ui.MWMoreParametersResultWidget( - { remainder: remainder }, { $: this.$ } - ) ); + items.push( new ve.ui.MWMoreParametersResultWidget( { + $: this.$, + data: { remainder: remainder } + } ) ); } this.results.addItems( items ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWReferenceGroupInputWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWReferenceGroupInputWidget.js index 036c78a..4eb4be6 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWReferenceGroupInputWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWReferenceGroupInputWidget.js @@ -38,8 +38,9 @@ * @param {ve.dm.InternalList} internalList Internal list with which to populate the menu */ ve.ui.MWReferenceGroupInputWidget.prototype.populateMenu = function ( internalList ) { - var placeholderGroupItem = new OO.ui.MenuOptionWidget( '', { + var placeholderGroupItem = new OO.ui.MenuOptionWidget( { $: this.$, + data: '', label: this.emptyGroupName, flags: 'emptyGroupPlaceholder' } ); @@ -50,7 +51,7 @@ if ( groupInternalName.indexOf( 'mwReference/' ) === 0 ) { var groupName = groupInternalName.substring( 'mwReference/'.length ); if ( groupName ) { - return new OO.ui.MenuOptionWidget( groupName, { label: groupName } ); + return new OO.ui.MenuOptionWidget( { data: groupName, label: groupName } ); } } } diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWReferenceResultWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWReferenceResultWidget.js index e457ac9..2bcfe4a 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWReferenceResultWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWReferenceResultWidget.js @@ -12,16 +12,15 @@ * @extends OO.ui.OptionWidget * * @constructor - * @param {Mixed} data Item data * @param {Object} [config] Configuration options * @cfg {boolean} [divider] Section divider item, not highlightable or selectable */ -ve.ui.MWReferenceResultWidget = function VeUiMWReferenceResultWidget( data, config ) { +ve.ui.MWReferenceResultWidget = function VeUiMWReferenceResultWidget( config ) { // Configuration initialization config = config || {}; // Parent constructor - OO.ui.OptionWidget.call( this, data, config ); + OO.ui.OptionWidget.call( this, config ); // Properties this.$shield = this.$( '<div>' ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js index ca3bb0c..d106cc0 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js @@ -239,8 +239,10 @@ .addClass( 've-ui-mwReferenceSearchWidget-name' ) .text( item.name ); items.push( - new ve.ui.MWReferenceResultWidget( i, { - $: this.$, label: $citation.add( $name ).add( item.$element ) + new ve.ui.MWReferenceResultWidget( { + $: this.$, + data: i, + label: $citation.add( $name ).add( item.$element ) } ) ); } diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js index dc64283..55528f0 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js @@ -110,9 +110,11 @@ } else { value = title.getPrefixedText(); } - items.push( new OO.ui.MenuOptionWidget( - value, { $: menu$, label: value } - ) ); + items.push( new OO.ui.MenuOptionWidget( { + $: menu$, + data: value, + label: value + } ) ); } ve.init.platform.linkCache.set( linkCacheUpdate ); } -- To view, visit https://gerrit.wikimedia.org/r/175166 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife6abd312d4dc97be67cb84eea4cb9c6a0a31b1d Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: Trevor Parscal <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
