Anomie has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399427 )
Change subject: Use new TagMultiselectWidget in ApiSandbox
......................................................................
Use new TagMultiselectWidget in ApiSandbox
It seems to be generally a 1:1 replacement.
Bug: T183299
Change-Id: I191a99bd373b0fb320770e9089278a16964d80d2
---
M resources/src/mediawiki.special/mediawiki.special.apisandbox.js
1 file changed, 20 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/27/399427/1
diff --git a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
index ff4335a..09b872b 100644
--- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
+++ b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
@@ -121,9 +121,9 @@
}
},
- capsuleWidget: {
+ tagWidget: {
getApiValue: function () {
- var items = this.getItemsData();
+ var items = this.getValue();
if ( items.join( '' ).indexOf( '|' ) === -1 ) {
return items.join( '|' );
} else {
@@ -132,13 +132,13 @@
},
setApiValue: function ( v ) {
if ( v === undefined || v === '' || v ===
'\x1f' ) {
- this.setItemsFromData( [] );
+ this.setValue( [] );
} else {
v = String( v );
if ( v.indexOf( '\x1f' ) !== 0 ) {
- this.setItemsFromData( v.split(
'|' ) );
+ this.setValue( v.split( '|' ) );
} else {
- this.setItemsFromData(
v.substr( 1 ).split( '\x1f' ) );
+ this.setValue( v.substr( 1
).split( '\x1f' ) );
}
}
},
@@ -149,8 +149,8 @@
if ( !suppressErrors ) {
ok = this.getApiValue() !== undefined
&& !(
pi.allspecifier !== undefined &&
- this.getItemsData().length > 1
&&
- this.getItemsData().indexOf(
pi.allspecifier ) !== -1
+ this.getValue().length > 1 &&
+ this.getValue().indexOf(
pi.allspecifier ) !== -1
);
}
@@ -158,8 +158,8 @@
this.setIconTitle( ok ? '' : mw.message(
'apisandbox-alert-field' ).plain() );
return $.Deferred().resolve( ok ).promise();
},
- createItemWidget: function ( data, label ) {
- var item =
OO.ui.CapsuleMultiselectWidget.prototype.createItemWidget.call( this, data,
label );
+ createTagItemWidget: function ( data, label ) {
+ var item =
OO.ui.TagMultiselectWidget.prototype.createTagItemWidget.call( this, data,
label );
if ( this.paramInfo.deprecatedvalues &&
this.paramInfo.deprecatedvalues.indexOf( data ) >= 0
) {
@@ -336,13 +336,13 @@
case 'string':
case 'user':
if ( Util.apiBool( pi.multi ) ) {
- widget = new
OO.ui.CapsuleMultiselectWidget( {
+ widget = new
OO.ui.TagMultiselectWidget( {
allowArbitrary: true,
allowDuplicates:
Util.apiBool( pi.allowsduplicates ),
$overlay: $(
'#mw-apisandbox-ui' )
} );
widget.paramInfo = pi;
- $.extend( widget,
WidgetMethods.capsuleWidget );
+ $.extend( widget,
WidgetMethods.tagWidget );
} else {
widget = new
OO.ui.TextInputWidget( {
required: Util.apiBool(
pi.required )
@@ -457,12 +457,12 @@
} ) );
}
- widget = new
OO.ui.CapsuleMultiselectWidget( {
+ widget = new
OO.ui.MenuTagMultiselectWidget( {
menu: { items: items },
$overlay: $(
'#mw-apisandbox-ui' )
} );
widget.paramInfo = pi;
- $.extend( widget,
WidgetMethods.capsuleWidget );
+ $.extend( widget,
WidgetMethods.tagWidget );
} else {
widget = new
OO.ui.DropdownWidget( {
menu: { items: items },
@@ -497,12 +497,12 @@
} ) );
}
- widget = new
OO.ui.CapsuleMultiselectWidget( {
+ widget = new
OO.ui.MenuTagMultiselectWidget( {
menu: { items: items },
$overlay: $(
'#mw-apisandbox-ui' )
} );
widget.paramInfo = pi;
- $.extend( widget,
WidgetMethods.capsuleWidget );
+ $.extend( widget,
WidgetMethods.tagWidget );
if ( Util.apiBool(
pi.submodules ) ) {
widget.getSubmodules =
WidgetMethods.submoduleWidget.multi;
widget.on( 'change',
ApiSandbox.updateUI );
@@ -551,7 +551,7 @@
throw new Error( 'Unknown
multiMode "' + multiMode + '"' );
}
- widget = new OO.ui.CapsuleMultiselectWidget( {
+ widget = new OO.ui.PopupTagMultiselectWidget( {
allowArbitrary: true,
allowDuplicates: Util.apiBool(
pi.allowsduplicates ),
$overlay: $( '#mw-apisandbox-ui' ),
@@ -561,13 +561,13 @@
}
} );
widget.paramInfo = pi;
- $.extend( widget, WidgetMethods.capsuleWidget );
+ $.extend( widget, WidgetMethods.tagWidget );
func = function () {
if ( !innerWidget.isDisabled() ) {
innerWidget.apiCheckValid().done( function ( ok ) {
if ( ok ) {
-
widget.addItemsFromData( [ innerWidget.getApiValue() ] );
+ widget.addTag(
innerWidget.getApiValue() );
innerWidget.setApiValue( undefined );
}
} );
@@ -1577,10 +1577,10 @@
}
if ( Util.apiBool(
pi.parameters[ i ].multi ) ) {
tmp = [];
- if ( flag && !( widget
instanceof OO.ui.CapsuleMultiselectWidget ) &&
+ if ( flag && !( widget
instanceof OO.ui.TagMultiselectWidget ) &&
!(
widget
instanceof OptionalWidget &&
-
widget.widget instanceof OO.ui.CapsuleMultiselectWidget
+
widget.widget instanceof OO.ui.TagMultiselectWidget
)
) {
tmp.push(
mw.message( 'api-help-param-multi-separate' ).parse() );
--
To view, visit https://gerrit.wikimedia.org/r/399427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I191a99bd373b0fb320770e9089278a16964d80d2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie <bjor...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
