Trevor Parscal has uploaded a new change for review. https://gerrit.wikimedia.org/r/173982
Change subject: Update VE core submodule to 4d56fc2a92ee56308e72ee77f724f6ae890d4e3c ...................................................................... Update VE core submodule to 4d56fc2a92ee56308e72ee77f724f6ae890d4e3c New changes: 6ae94bc Add tests for ve.instanceOfAny() ea1ac17 Localisation updates from https://translatewiki.net. 4d56fc2 Update OOjs UI to v0.1.0-pre (549ff9ab7d) Update changes: Changes were generated by running this script: https://gist.github.com/trevorparscal/265f1b8c854190637a1e File changes: Scripts (modules/ve-mw/ui/widgets) - ve.ui.MWInternalLinkMenuItemWidget.js → ve.ui.MWInternalLinkMenuOptionWidget.js - ve.ui.MWLinkMenuItemWidget.js → ve.ui.MWLinkMenuOptionWidget.js File content changes: Scripts (*.js) - MWInternalLinkMenuItemWidget → MWInternalLinkMenuOptionWidget - MWLinkMenuItemWidget → MWLinkMenuOptionWidget - ContextMenuWidget → ContextSelectWidget - ContextItemWidget → ContextOptionWidget - TextInputMenuWidget → TextInputMenuSelectWidget - MenuWidget → MenuSelectWidget - MenuItemWidget → MenuOptionWidget - MenuSectionItemWidget → MenuSectionOptionWidget - OutlineWidget → OutlineSelectWidget - OutlineItemWidget → OutlineOptionWidget Styles (*.less) - contextMenuWidget → contextSelectWidget - contextItemWidget → contextOptionWidget - textInputMenuWidget → textInputMenuSelectWidget - menuWidget → menuSelectWidget - menuItemWidget → menuOptionWidget - menuSectionItemWidget → menuSectionOptionWidget - outlineWidget → outlineSelectWidget - outlineItemWidget → outlineOptionWidget Change-Id: Ifded7f9e17923dbb56a722b7424ccd2854194c21 --- M VisualEditor.php M lib/ve M modules/ve-mw/ce/styles/nodes/ve.ce.MWReferencesListNode.css M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-apex.css M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css M modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryPopupWidget.css M modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryWidget.css M modules/ve-mw/ui/styles/widgets/ve.ui.MWLinkTargetInputWidget.css M modules/ve-mw/ui/styles/widgets/ve.ui.MWParameterSearchWidget.css M modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceGroupInputWidget.css M modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceSearchWidget.css M modules/ve-mw/ui/styles/widgets/ve.ui.MWTitleInputWidget.css M modules/ve-mw/ui/themes/apex/ve.ui.MWLinkTargetInputWidget.css M modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js D modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkMenuItemWidget.js A modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkMenuOptionWidget.js D modules/ve-mw/ui/widgets/ve.ui.MWLinkMenuItemWidget.js A 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.MWReferenceGroupInputWidget.js M modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js 23 files changed, 107 insertions(+), 107 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/82/173982/1 diff --git a/VisualEditor.php b/VisualEditor.php index c79eda8..fa07140 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -559,8 +559,8 @@ 'lib/ve/src/ui/widgets/ve.ui.SurfaceWidget.js', 'lib/ve/src/ui/widgets/ve.ui.LinkTargetInputWidget.js', - 'lib/ve/src/ui/widgets/ve.ui.ContextMenuWidget.js', - 'lib/ve/src/ui/widgets/ve.ui.ContextItemWidget.js', + 'lib/ve/src/ui/widgets/ve.ui.ContextSelectWidget.js', + 'lib/ve/src/ui/widgets/ve.ui.ContextOptionWidget.js', 'lib/ve/src/ui/widgets/ve.ui.DimensionsWidget.js', 'lib/ve/src/ui/widgets/ve.ui.MediaSizeWidget.js', 'lib/ve/src/ui/widgets/ve.ui.WhitespacePreservingTextInputWidget.js', @@ -604,8 +604,8 @@ // ui 'lib/ve/src/ui/styles/dialogs/ve.ui.CommandHelpDialog.css', 'lib/ve/src/ui/styles/tools/ve.ui.FormatTool.css', - 'lib/ve/src/ui/styles/widgets/ve.ui.ContextItemWidget.css', - 'lib/ve/src/ui/styles/widgets/ve.ui.ContextMenuWidget.css', + 'lib/ve/src/ui/styles/widgets/ve.ui.ContextOptionWidget.css', + 'lib/ve/src/ui/styles/widgets/ve.ui.ContextSelectWidget.css', 'lib/ve/src/ui/styles/widgets/ve.ui.DimensionsWidget.css', 'lib/ve/src/ui/styles/widgets/ve.ui.MediaSizeWidget.css', 'lib/ve/src/ui/styles/inspectors/ve.ui.CommentInspector.css', @@ -991,8 +991,8 @@ 'modules/ve-mw/ce/annotations/ve.ce.MWInternalLinkAnnotation.js', 'modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js', - 'modules/ve-mw/ui/widgets/ve.ui.MWLinkMenuItemWidget.js', - 'modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkMenuItemWidget.js', + 'modules/ve-mw/ui/widgets/ve.ui.MWLinkMenuOptionWidget.js', + 'modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkMenuOptionWidget.js', 'modules/ve-mw/ui/inspectors/ve.ui.MWLinkAnnotationInspector.js', 'modules/ve-mw/ui/inspectors/ve.ui.MWLinkNodeInspector.js', diff --git a/lib/ve b/lib/ve index fa572a5..4d56fc2 160000 --- a/lib/ve +++ b/lib/ve -Subproject commit fa572a50e488579fbaa1a945a23541470e87483f +Subproject commit 4d56fc2a92ee56308e72ee77f724f6ae890d4e3c diff --git a/modules/ve-mw/ce/styles/nodes/ve.ce.MWReferencesListNode.css b/modules/ve-mw/ce/styles/nodes/ve.ce.MWReferencesListNode.css index fefcb63..58e0f5c 100644 --- a/modules/ve-mw/ce/styles/nodes/ve.ce.MWReferencesListNode.css +++ b/modules/ve-mw/ce/styles/nodes/ve.ce.MWReferencesListNode.css @@ -12,4 +12,4 @@ .ve-ce-mwReferencesListNode-muted { font-style: italic; color: #777; -} \ No newline at end of file +} diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-apex.css b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-apex.css index 6c5cbaa..5b2379f 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-apex.css +++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-apex.css @@ -19,6 +19,6 @@ line-height: 1.5em; } -.oo-ui-menuWidget-item:hover { +.oo-ui-menuSelectWidget-item:hover { background-color: #d5eaed; } diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css index 61a3c67..0f798f9 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css +++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-vector.css @@ -22,7 +22,7 @@ padding: 0 1.143em; /* surface-margin-left (1em) / (mw-body-content font-size) 0.875em */ } -.ve-init-mw-viewPageTarget-surface .oo-ui-menuWidget { +.ve-init-mw-viewPageTarget-surface .oo-ui-menuSelectWidget { font-size: 0.8em; } diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css index 0dc5d14..3023d2e 100644 --- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css +++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css @@ -101,4 +101,4 @@ /* Override overflow: hidden; from MW styles */ .ve-ui-commandHelpDialog-section h3 { overflow: visible; -} \ No newline at end of file +} diff --git a/modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryPopupWidget.css b/modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryPopupWidget.css index ab66e51..1be235e 100644 --- a/modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryPopupWidget.css +++ b/modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryPopupWidget.css @@ -46,4 +46,4 @@ .ve-ui-mwCategoryPopupWidget-sortKeyForm .oo-ui-labelWidget { padding: 0 0.125em 0.5em 0.125em; -} \ No newline at end of file +} diff --git a/modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryWidget.css b/modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryWidget.css index a388089..b1a1b6e 100644 --- a/modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryWidget.css +++ b/modules/ve-mw/ui/styles/widgets/ve.ui.MWCategoryWidget.css @@ -19,4 +19,4 @@ word-break: break-word; word-wrap: break-word; overflow-wrap: break-word; -} \ No newline at end of file +} diff --git a/modules/ve-mw/ui/styles/widgets/ve.ui.MWLinkTargetInputWidget.css b/modules/ve-mw/ui/styles/widgets/ve.ui.MWLinkTargetInputWidget.css index 5d6a8c6..8960b7d 100644 --- a/modules/ve-mw/ui/styles/widgets/ve.ui.MWLinkTargetInputWidget.css +++ b/modules/ve-mw/ui/styles/widgets/ve.ui.MWLinkTargetInputWidget.css @@ -10,4 +10,4 @@ .ve-ui-mwLinkTargetInputWidget-warning { color: #d45353; font-weight: bold; -} \ No newline at end of file +} diff --git a/modules/ve-mw/ui/styles/widgets/ve.ui.MWParameterSearchWidget.css b/modules/ve-mw/ui/styles/widgets/ve.ui.MWParameterSearchWidget.css index a7fdef4..aee863a 100644 --- a/modules/ve-mw/ui/styles/widgets/ve.ui.MWParameterSearchWidget.css +++ b/modules/ve-mw/ui/styles/widgets/ve.ui.MWParameterSearchWidget.css @@ -12,4 +12,4 @@ .ve-ui-mwParameterSearchWidget .oo-ui-searchWidget-results { overflow-y: hidden; -} \ No newline at end of file +} diff --git a/modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceGroupInputWidget.css b/modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceGroupInputWidget.css index fa83703..16f808f 100644 --- a/modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceGroupInputWidget.css +++ b/modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceGroupInputWidget.css @@ -7,4 +7,4 @@ .ve-ui-mwReferenceGroupInputWidget .oo-ui-flaggableElement-emptyGroupPlaceholder { color: grey; -} \ No newline at end of file +} diff --git a/modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceSearchWidget.css b/modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceSearchWidget.css index 0aa3638..3220d57 100644 --- a/modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceSearchWidget.css +++ b/modules/ve-mw/ui/styles/widgets/ve.ui.MWReferenceSearchWidget.css @@ -15,4 +15,4 @@ margin-left: 0.75em; margin-bottom: 0.05em; color: #777; -} \ No newline at end of file +} diff --git a/modules/ve-mw/ui/styles/widgets/ve.ui.MWTitleInputWidget.css b/modules/ve-mw/ui/styles/widgets/ve.ui.MWTitleInputWidget.css index 81fe9aa..76d59a3 100644 --- a/modules/ve-mw/ui/styles/widgets/ve.ui.MWTitleInputWidget.css +++ b/modules/ve-mw/ui/styles/widgets/ve.ui.MWTitleInputWidget.css @@ -7,4 +7,4 @@ .ve-ui-mwTitleInputWidget { width:30em; -} \ No newline at end of file +} diff --git a/modules/ve-mw/ui/themes/apex/ve.ui.MWLinkTargetInputWidget.css b/modules/ve-mw/ui/themes/apex/ve.ui.MWLinkTargetInputWidget.css index 2468c5e..bd8b47c 100644 --- a/modules/ve-mw/ui/themes/apex/ve.ui.MWLinkTargetInputWidget.css +++ b/modules/ve-mw/ui/themes/apex/ve.ui.MWLinkTargetInputWidget.css @@ -10,7 +10,7 @@ margin-top: -7px; } -.ve-ui-mwLinkTargetInputWidget-menu .oo-ui-menuWidget-item { +.ve-ui-mwLinkTargetInputWidget-menu .oo-ui-menuSelectWidget-item { padding: 0.33em 1.25em; color: #0645AD; } diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js index 44eb773..f21877d 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js @@ -172,7 +172,7 @@ } ], function ( index, sectionData ) { if ( sectionData.items.length ) { - itemWidgets.push( new OO.ui.MenuSectionItemWidget( + itemWidgets.push( new OO.ui.MenuSectionOptionWidget( sectionData.id, { $: this.lookupMenu.$, label: sectionData.label } ) ); $.each( sectionData.items, function ( index, categoryItem ) { @@ -189,14 +189,14 @@ * * @method * @param {string} name Category name - * @returns {OO.ui.MenuItemWidget} Menu item widget to be shown + * @returns {OO.ui.MenuOptionWidget} Menu item widget to be shown */ ve.ui.MWCategoryInputWidget.prototype.getCategoryWidgetFromName = function ( name ) { var cachedData = ve.init.platform.linkCache.getCached( mw.Title.newFromText( name, mw.config.get( 'wgNamespaceIds' ).category ).getPrefixedText() ); if ( cachedData && cachedData.redirectFrom ) { - return new OO.ui.MenuItemWidget( name, { + return new OO.ui.MenuOptionWidget( name, { $: this.lookupMenu.$, autoFitLabel: false, label: this.$( '<span>' ) @@ -205,7 +205,7 @@ .append( this.$( '<span>' ).text( mw.Title.newFromText( name ).getMainText() ) ) } ); } else { - return new OO.ui.MenuItemWidget( name, { $: this.lookupMenu.$, label: name } ); + return new OO.ui.MenuOptionWidget( name, { $: this.lookupMenu.$, label: name } ); } }; diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js index d64ff11..c6bce9f 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js @@ -87,7 +87,7 @@ * Handle menu item select event. * * @method - * @param {OO.ui.MenuItemWidget} item Selected item + * @param {OO.ui.MenuOptionWidget} item Selected item */ ve.ui.MWCategoryWidget.prototype.onLookupMenuItemChoose = function ( item ) { var categoryItem, diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkMenuItemWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkMenuItemWidget.js deleted file mode 100644 index badb3a4..0000000 --- a/modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkMenuItemWidget.js +++ /dev/null @@ -1,34 +0,0 @@ -/*! - * VisualEditor UserInterface MWLinkMenuItemWidget class - * - * @copyright 2011-2014 VisualEditor Team and others; see http://ve.mit-license.org - */ - -/** - * Creates a ve.ui.MWInternalLinkMenuItemWidget object. - * - * @class - * @extends ve.ui.MWLinkMenuItemWidget - * - * @constructor - * @param {Mixed} data Item data - * @param {Object} [config] Configuration options - * @cfg {string} [pagename] Pagename to return the names of internal pages - */ -ve.ui.MWInternalLinkMenuItemWidget = function VeUiMWInternalLinkMenuItemWidget( data, config ) { - // Config intialization - config = config || {}; - - // Properties - this.pagename = config.pagename; - - // Parent constructor - ve.ui.MWLinkMenuItemWidget.call( this, data, $.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 ); -}; - -/* Inheritance */ - -OO.inheritClass( ve.ui.MWInternalLinkMenuItemWidget, ve.ui.MWLinkMenuItemWidget ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkMenuOptionWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkMenuOptionWidget.js new file mode 100644 index 0000000..86c4af3 --- /dev/null +++ b/modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkMenuOptionWidget.js @@ -0,0 +1,34 @@ +/*! + * VisualEditor UserInterface MWLinkMenuOptionWidget class + * + * @copyright 2011-2014 VisualEditor Team and others; see http://ve.mit-license.org + */ + +/** + * Creates a ve.ui.MWInternalLinkMenuOptionWidget object. + * + * @class + * @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 ) { + // Config intialization + config = config || {}; + + // Properties + this.pagename = config.pagename; + + // Parent constructor + ve.ui.MWLinkMenuOptionWidget.call( this, data, $.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 ); +}; + +/* Inheritance */ + +OO.inheritClass( ve.ui.MWInternalLinkMenuOptionWidget, ve.ui.MWLinkMenuOptionWidget ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWLinkMenuItemWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWLinkMenuItemWidget.js deleted file mode 100644 index 9eab189..0000000 --- a/modules/ve-mw/ui/widgets/ve.ui.MWLinkMenuItemWidget.js +++ /dev/null @@ -1,33 +0,0 @@ -/*! - * VisualEditor UserInterface MWLinkMenuItemWidget class - * - * @copyright 2011-2014 VisualEditor Team and others; see http://ve.mit-license.org - */ - -/** - * Creates a ve.ui.MWLinkMenuItemWidget object. - * - * @class - * @extends OO.ui.MenuItemWidget - * - * @constructor - * @param {Mixed} data Item data - * @param {Object} [config] Configuration options - * @cfg {string} [href] href to point to pages from link suggestions - */ -ve.ui.MWLinkMenuItemWidget = function VeUiMWLinkMenuItemWidget( data, config ) { - // Config intialization - config = config || {}; - - // Parent constructor - ve.ui.MWLinkMenuItemWidget.super.call( this, data, config ); - - // Intialization - this.$label.wrap( '<a>' ); - this.$link = this.$label.parent(); - this.$link.attr( 'href', config.href ); -}; - -/* Inheritance */ - -OO.inheritClass( ve.ui.MWLinkMenuItemWidget, OO.ui.MenuItemWidget ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWLinkMenuOptionWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWLinkMenuOptionWidget.js new file mode 100644 index 0000000..135c73f --- /dev/null +++ b/modules/ve-mw/ui/widgets/ve.ui.MWLinkMenuOptionWidget.js @@ -0,0 +1,33 @@ +/*! + * VisualEditor UserInterface MWLinkMenuOptionWidget class + * + * @copyright 2011-2014 VisualEditor Team and others; see http://ve.mit-license.org + */ + +/** + * Creates a ve.ui.MWLinkMenuOptionWidget object. + * + * @class + * @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 ) { + // Config intialization + config = config || {}; + + // Parent constructor + ve.ui.MWLinkMenuOptionWidget.super.call( this, data, config ); + + // Intialization + this.$label.wrap( '<a>' ); + this.$link = this.$label.parent(); + this.$link.attr( 'href', config.href ); +}; + +/* Inheritance */ + +OO.inheritClass( ve.ui.MWLinkMenuOptionWidget, OO.ui.MenuOptionWidget ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js index cab3dcc..d6e73b4 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js @@ -53,7 +53,7 @@ * a link to "Foo". * * @method - * @param {OO.ui.MenuItemWidget|null} item Selected item + * @param {OO.ui.MenuOptionWidget|null} item Selected item */ ve.ui.MWLinkTargetInputWidget.prototype.onLookupMenuItemChoose = function ( item ) { this.closeLookupMenu(); @@ -134,7 +134,7 @@ * Get list of menu items from a server response. * * @param {Object} data Query result - * @returns {OO.ui.MenuItemWidget[]} Menu items + * @returns {OO.ui.MenuOptionWidget[]} Menu items */ ve.ui.MWLinkTargetInputWidget.prototype.getLookupMenuItemsFromData = function ( data ) { var i, len, item, pageExistsExact, pageExists, index, matchingPage, @@ -178,11 +178,11 @@ // External link if ( ve.init.platform.getExternalLinkUrlProtocolsRegExp().test( this.value ) ) { - items.push( new OO.ui.MenuSectionItemWidget( + items.push( new OO.ui.MenuSectionOptionWidget( 'externalLink', { $: menu$, label: ve.msg( 'visualeditor-linkinspector-suggest-external-link' ) } ) ); - items.push( new ve.ui.MWLinkMenuItemWidget( + items.push( new ve.ui.MWLinkMenuOptionWidget( this.getExternalLinkAnnotationFromUrl( this.value ), { $: menu$, classes: [ 've-ui-mwLinkTargetInputWidget-extlink' ], label: this.value, href: this.value } ) ); @@ -191,17 +191,17 @@ // Internal link if ( !pageExists ) { if ( titleObj ) { - items.push( new OO.ui.MenuSectionItemWidget( + items.push( new OO.ui.MenuSectionOptionWidget( 'newPage', { $: menu$, label: ve.msg( 'visualeditor-linkinspector-suggest-new-page' ) } ) ); - items.push( new ve.ui.MWInternalLinkMenuItemWidget( + items.push( new ve.ui.MWInternalLinkMenuOptionWidget( this.getInternalLinkAnnotationFromTitle( this.value ), { $: menu$, pagename: this.value } ) ); } else { // If no title object could be created, it means the title is illegal - item = new OO.ui.MenuSectionItemWidget( + item = new OO.ui.MenuSectionOptionWidget( 'illegalTitle', { $: menu$, label: ve.msg( 'visualeditor-linkinspector-illegal-title' ) } ); @@ -212,7 +212,7 @@ // Matching pages if ( matchingPages && matchingPages.length ) { - items.push( new OO.ui.MenuSectionItemWidget( + items.push( new OO.ui.MenuSectionOptionWidget( 'matchingPages', { $: menu$, label: ve.msg( 'visualeditor-linkinspector-suggest-matching-page', matchingPages.length ) } ) ); @@ -221,7 +221,7 @@ matchingPages.unshift( this.value ); } for ( i = 0, len = matchingPages.length; i < len; i++ ) { - items.push( new ve.ui.MWInternalLinkMenuItemWidget( + items.push( new ve.ui.MWInternalLinkMenuOptionWidget( this.getInternalLinkAnnotationFromTitle( matchingPages[i] ), { $: menu$, pagename: matchingPages[i] } ) ); @@ -230,12 +230,12 @@ // Disambiguation pages if ( disambigPages.length ) { - items.push( new OO.ui.MenuSectionItemWidget( + items.push( new OO.ui.MenuSectionOptionWidget( 'disambigPages', { $: menu$, label: ve.msg( 'visualeditor-linkinspector-suggest-disambig-page', disambigPages.length ) } ) ); for ( i = 0, len = disambigPages.length; i < len; i++ ) { - items.push( new ve.ui.MWInternalLinkMenuItemWidget( + items.push( new ve.ui.MWInternalLinkMenuOptionWidget( this.getInternalLinkAnnotationFromTitle( disambigPages[i] ), { $: menu$, pagename: disambigPages[i] } ) ); @@ -244,12 +244,12 @@ // Redirect pages if ( redirectPages.length ) { - items.push( new OO.ui.MenuSectionItemWidget( + items.push( new OO.ui.MenuSectionOptionWidget( 'redirectPages', { $: menu$, label: ve.msg( 'visualeditor-linkinspector-suggest-redirect-page', redirectPages.length ) } ) ); for ( i = 0, len = redirectPages.length; i < len; i++ ) { - items.push( new OO.ui.MenuItemWidget( + items.push( new OO.ui.MenuOptionWidget( this.getInternalLinkAnnotationFromTitle( redirectPages[i] ), { $: menu$, rel: 'redirectPage', label: redirectPages[i] } ) ); diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWReferenceGroupInputWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWReferenceGroupInputWidget.js index 7d51329..036c78a 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWReferenceGroupInputWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWReferenceGroupInputWidget.js @@ -38,7 +38,7 @@ * @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.MenuItemWidget( '', { + var placeholderGroupItem = new OO.ui.MenuOptionWidget( '', { $: this.$, label: this.emptyGroupName, flags: 'emptyGroupPlaceholder' @@ -50,7 +50,7 @@ if ( groupInternalName.indexOf( 'mwReference/' ) === 0 ) { var groupName = groupInternalName.substring( 'mwReference/'.length ); if ( groupName ) { - return new OO.ui.MenuItemWidget( groupName, { label: groupName } ); + return new OO.ui.MenuOptionWidget( groupName, { label: groupName } ); } } } diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js index 7efc8d3..3a33e08 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js @@ -49,7 +49,7 @@ * Handle menu item select event. * * @method - * @param {OO.ui.MenuItemWidget} item Selected item + * @param {OO.ui.MenuOptionWidget} item Selected item */ ve.ui.MWTitleInputWidget.prototype.onLookupMenuItemChoose = function ( item ) { this.closeLookupMenu(); @@ -110,7 +110,7 @@ } else { value = title.getPrefixedText(); } - items.push( new OO.ui.MenuItemWidget( + items.push( new OO.ui.MenuOptionWidget( value, { $: menu$, label: value } ) ); } -- To view, visit https://gerrit.wikimedia.org/r/173982 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifded7f9e17923dbb56a722b7424ccd2854194c21 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Trevor Parscal <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
