jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404885 )
Change subject: demos, docs: Replace 'alert' indicator, as it's deprecated
......................................................................
demos, docs: Replace 'alert' indicator, as it's deprecated
Bug: T185158
Change-Id: I17e05c1c75a343c7172e6a71d52de475d6d34147
---
M demos/pages/widgets.js
M demos/pages/widgets.php
M src/mixins/IndicatorElement.js
M src/widgets/IndicatorWidget.js
4 files changed, 30 insertions(+), 30 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index aec8f0c..0ad5e14 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -220,7 +220,7 @@
),
new OO.ui.FieldLayout(
new OO.ui.ButtonWidget( {
- indicator: 'alert',
+ indicator: 'clear',
title: 'Indicator only, framed'
} ),
{
@@ -242,7 +242,7 @@
new OO.ui.FieldLayout(
new OO.ui.ButtonWidget( {
framed: false,
- indicator: 'alert',
+ indicator: 'clear',
title: 'Indicator only'
} ),
{
@@ -457,7 +457,7 @@
label: 'Two'
} ),
new OO.ui.ButtonWidget(
{
- indicator:
'alert',
+ indicator:
'clear',
label: 'Three'
} )
]
@@ -514,7 +514,7 @@
label: 'Two'
} ),
new
OO.ui.ToggleButtonWidget( {
- indicator:
'alert',
+ indicator:
'clear',
label: 'Three'
} )
]
@@ -538,7 +538,7 @@
} ),
new
OO.ui.ButtonOptionWidget( {
data: 'd',
- indicator:
'alert',
+ indicator:
'clear',
label: 'Three'
} )
]
@@ -563,7 +563,7 @@
} ),
new
OO.ui.ButtonOptionWidget( {
data: 'd',
- indicator:
'alert',
+ indicator:
'clear',
label: 'Three'
} )
]
@@ -588,7 +588,7 @@
} ),
new
OO.ui.ButtonOptionWidget( {
data: 'd',
- indicator:
'alert',
+ indicator:
'clear',
label: 'Three'
} )
]
@@ -757,7 +757,7 @@
new OO.ui.MultilineTextInputWidget( {
autosize: true,
icon: 'tag',
- indicator: 'alert',
+ indicator: 'clear',
label: 'Inline label',
value:
'Autosize\nAutosize\nAutosize\nAutosize'
} ),
@@ -790,7 +790,7 @@
new OO.ui.FieldLayout(
new OO.ui.TextInputWidget( {
icon: 'tag',
- indicator: 'alert',
+ indicator: 'clear',
value: 'Text input with label',
label: 'Inline label'
} ),
@@ -802,7 +802,7 @@
new OO.ui.FieldLayout(
new OO.ui.TextInputWidget( {
icon: 'tag',
- indicator: 'alert',
+ indicator: 'clear',
value: 'Text input with label',
label: 'Inline label',
labelPosition: 'before'
@@ -816,7 +816,7 @@
new OO.ui.TextInputWidget( {
value: 'Disabled',
icon: 'tag',
- indicator: 'alert',
+ indicator: 'clear',
label: 'Inline label',
disabled: true
} ),
@@ -1184,7 +1184,7 @@
new
OO.ui.MenuOptionWidget( {
data:
'b',
label:
'Second',
-
indicator: 'alert'
+
indicator: 'clear'
} ),
new
OO.ui.MenuOptionWidget( {
data:
'c',
@@ -1220,7 +1220,7 @@
new
OO.ui.MenuOptionWidget( {
data:
'b',
label:
'Disabled second option',
-
indicator: 'alert',
+
indicator: 'clear',
disabled: true
} ),
new
OO.ui.MenuOptionWidget( {
@@ -1654,7 +1654,7 @@
new OO.ui.FieldLayout(
new OO.ui.SelectFileWidget( {
icon: 'tag',
- indicator: 'alert'
+ indicator: 'clear'
} ),
{
label: 'SelectFileWidget (icon,
indicator)\u200E',
@@ -1664,7 +1664,7 @@
new OO.ui.FieldLayout(
new OO.ui.SelectFileWidget( {
icon: 'tag',
- indicator: 'alert',
+ indicator: 'clear',
disabled: true
} ),
{
@@ -1769,7 +1769,7 @@
new OO.ui.PopupTagMultiselectWidget( {
allowArbitrary: true,
icon: 'tag',
- indicator: 'alert'
+ indicator: 'clear'
} ),
{
label:
'PopupTagMultiselectWidget (icon, indicator, allowArbitrary)',
@@ -1873,7 +1873,7 @@
new OO.ui.CapsuleMultiselectWidget( {
allowArbitrary: true,
icon: 'tag',
- indicator: 'alert',
+ indicator: 'clear',
menu: {
items: [
new
OO.ui.MenuOptionWidget( { data: 'abc', label: 'Label for abc' } ),
@@ -1894,7 +1894,7 @@
new OO.ui.CapsuleMultiselectWidget( {
disabled: true,
icon: 'tag',
- indicator: 'alert',
+ indicator: 'clear',
menu: {
items: [
new
OO.ui.MenuOptionWidget( { data: 'abc', label: 'Label for abc' } ),
@@ -2350,7 +2350,7 @@
),
new OO.ui.FieldLayout(
new OO.ui.IndicatorWidget( {
- indicator: 'alert',
+ indicator: 'clear',
title: 'Required indicator'
} ),
{
@@ -2360,7 +2360,7 @@
),
new OO.ui.FieldLayout(
new OO.ui.IndicatorWidget( {
- indicator: 'alert',
+ indicator: 'clear',
title: 'Required indicator',
disabled: true
} ),
@@ -2827,7 +2827,7 @@
label: 'Two'
} ),
new
OO.ui.ButtonOptionWidget( {
-
indicator: 'alert',
+
indicator: 'clear',
label: 'Three'
} )
]
diff --git a/demos/pages/widgets.php b/demos/pages/widgets.php
index 9f1c971..04a5bb7 100644
--- a/demos/pages/widgets.php
+++ b/demos/pages/widgets.php
@@ -288,7 +288,7 @@
'label' => 'Two'
] ),
new OOUI\ButtonWidget( [
- 'indicator' => 'required',
+ 'indicator' => 'clear',
'label' => 'Three'
] )
]
@@ -430,7 +430,7 @@
new OOUI\MultilineTextInputWidget( [
'value' => "Multiline\nMultiline",
'icon' => 'tag',
- 'indicator' => 'alert'
+ 'indicator' => 'required'
] ),
[
'label' => "MultilineTextInputWidget (icon,
indicator)\xE2\x80\x8E",
diff --git a/src/mixins/IndicatorElement.js b/src/mixins/IndicatorElement.js
index c29ee25..5e2ad32 100644
--- a/src/mixins/IndicatorElement.js
+++ b/src/mixins/IndicatorElement.js
@@ -19,7 +19,7 @@
* @param {Object} [config] Configuration options
* @cfg {jQuery} [$indicator] The indicator element created by the class. If
this
* configuration is omitted, the indicator element will use a generated
`<span>`.
- * @cfg {string} [indicator] Symbolic name of the indicator (e.g., ‘alert’ or
‘down’).
+ * @cfg {string} [indicator] Symbolic name of the indicator (e.g., ‘clear’ or
‘down’).
* See the [OOUI documentation on MediaWiki][2] for a list of indicators
included
* in the library.
* [2]:
https://www.mediawiki.org/wiki/OOUI/Widgets/Icons,_Indicators,_and_Labels#Indicators
@@ -49,7 +49,7 @@
/* Static Properties */
/**
- * Symbolic name of the indicator (e.g., ‘alert’ or ‘down’).
+ * Symbolic name of the indicator (e.g., ‘clear’ or ‘down’).
* The static property will be overridden if the #indicator configuration is
used.
*
* @static
@@ -95,7 +95,7 @@
};
/**
- * Set the indicator by its symbolic name: ‘alert’, ‘down’, ‘next’,
‘previous’, ‘required’, ‘up’. Use `null` to remove the indicator.
+ * Set the indicator by its symbolic name: ‘clear’, ‘down’, ‘required’,
‘search’, ‘up’. Use `null` to remove the indicator.
*
* @param {string|null} indicator Symbolic name of indicator, or `null` for no
indicator
* @chainable
@@ -150,7 +150,7 @@
};
/**
- * Get the symbolic name of the indicator (e.g., ‘alert’ or ‘down’).
+ * Get the symbolic name of the indicator (e.g., ‘clear’ or ‘down’).
*
* @return {string} Symbolic name of indicator
*/
diff --git a/src/widgets/IndicatorWidget.js b/src/widgets/IndicatorWidget.js
index 20b88c6..383848c 100644
--- a/src/widgets/IndicatorWidget.js
+++ b/src/widgets/IndicatorWidget.js
@@ -1,18 +1,18 @@
/**
* IndicatorWidgets create indicators, which are small graphics that are
generally used to draw
- * attention to the status of an item or to clarify the function of a control.
For a list of
+ * attention to the status of an item or to clarify the function within a
control. For a list of
* indicators included in the library, please see the [OOUI documentation on
MediaWiki][1].
*
* @example
* // Example of an indicator widget
* var indicator1 = new OO.ui.IndicatorWidget( {
- * indicator: 'alert'
+ * indicator: 'required'
* } );
*
* // Create a fieldset layout to add a label
* var fieldset = new OO.ui.FieldsetLayout();
* fieldset.addItems( [
- * new OO.ui.FieldLayout( indicator1, { label: 'An alert indicator:' }
)
+ * new OO.ui.FieldLayout( indicator1, { label: 'A required indicator:'
} )
* ] );
* $( 'body' ).append( fieldset.$element );
*
--
To view, visit https://gerrit.wikimedia.org/r/404885
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I17e05c1c75a343c7172e6a71d52de475d6d34147
Gerrit-PatchSet: 4
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
