Merge "rdbms: clean up DBO_TRX behavior for onTransactionPreCommitOrIdle()"

[lhc/web/wiklou.git] / resources / lib / oojs-ui / oojs-ui-core.js

diff --git a/resources/lib/oojs-ui/oojs-ui-core.js b/resources/lib/oojs-ui/oojs-ui-core.js
index 12e5ef6..0b1b8db 100644 (file)
--- a/resources/lib/oojs-ui/oojs-ui-core.js
+++ b/resources/lib/oojs-ui/oojs-ui-core.js
@@ -1,12 +1,12 @@
 /*!
- * OOUI v0.25.2
+ * OOUI v0.26.0
  * https://www.mediawiki.org/wiki/OOUI
  *
  * Copyright 2011–2018 OOUI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2018-02-07T00:27:24Z
+ * Date: 2018-03-21T00:00:53Z
  */
 ( function ( OO ) {
 
@@ -533,7 +533,7 @@ OO.ui.isSafeUrl = function ( url ) {
  * It is left up to implementors to decide how to compute this
  * so the default implementation always returns false.
  *
- * @return {boolean} Use is on a mobile device
+ * @return {boolean} User is on a mobile device
  */
 OO.ui.isMobile = function () {
        return false;
@@ -9336,26 +9336,51 @@ OO.ui.DropdownInputWidget.prototype.setOptionsData = function ( options ) {
        this.optionsDirty = true;
 
        optionWidgets = options.map( function ( opt ) {
-               var optValue, optionWidget;
+               var optValue;
 
-               if ( opt.optgroup === undefined ) {
-                       optValue = widget.cleanUpValue( opt.data );
-                       optionWidget = new OO.ui.MenuOptionWidget( {
-                               data: optValue,
-                               label: opt.label !== undefined ? opt.label : optValue
-                       } );
-               } else {
-                       optionWidget = new OO.ui.MenuSectionOptionWidget( {
-                               label: opt.optgroup
-                       } );
+               if ( opt.optgroup !== undefined ) {
+                       return widget.createMenuSectionOptionWidget( opt.optgroup );
                }
 
-               return optionWidget;
+               optValue = widget.cleanUpValue( opt.data );
+               return widget.createMenuOptionWidget(
+                       optValue,
+                       opt.label !== undefined ? opt.label : optValue
+               );
+
        } );
 
        this.dropdownWidget.getMenu().clearItems().addItems( optionWidgets );
 };
 
+/**
+ * Create a menu option widget.
+ *
+ * @protected
+ * @param {string} data Item data
+ * @param {string} label Item label
+ * @return {OO.ui.MenuOptionWidget} Option widget
+ */
+OO.ui.DropdownInputWidget.prototype.createMenuOptionWidget = function ( data, label ) {
+       return new OO.ui.MenuOptionWidget( {
+               data: data,
+               label: label
+       } );
+};
+
+/**
+ * Create a menu section option widget.
+ *
+ * @protected
+ * @param {string} label Section item label
+ * @return {OO.ui.MenuSectionOptionWidget} Menu section option widget
+ */
+OO.ui.DropdownInputWidget.prototype.createMenuSectionOptionWidget = function ( label ) {
+       return new OO.ui.MenuSectionOptionWidget( {
+               label: label
+       } );
+};
+
 /**
  * Update the user-visible interface to match the internal list of options and value.
  *
@@ -9767,6 +9792,8 @@ OO.ui.CheckboxMultiselectInputWidget = function OoUiCheckboxMultiselectInputWidg
 
        // Properties (must be done before parent constructor which calls #setDisabled)
        this.checkboxMultiselectWidget = new OO.ui.CheckboxMultiselectWidget();
+       // Must be set before the #setOptionsData call below
+       this.inputName = config.name;
        // Set up the options before parent constructor, which uses them to validate config.value.
        // Use this instead of setOptions() because this.$input is not set up yet
        this.setOptionsData( config.options || [] );
@@ -9774,9 +9801,6 @@ OO.ui.CheckboxMultiselectInputWidget = function OoUiCheckboxMultiselectInputWidg
        // Parent constructor
        OO.ui.CheckboxMultiselectInputWidget.parent.call( this, config );
 
-       // Properties
-       this.inputName = config.name;
-
        // Events
        this.checkboxMultiselectWidget.connect( this, { select: 'onCheckboxesSelect' } );
 
@@ -11438,7 +11462,7 @@ OO.ui.FieldLayout.prototype.makeMessage = function ( kind, text ) {
                $icon = new OO.ui.IconWidget( { icon: 'alert', flags: [ 'warning' ] } ).$element;
                $listItem.attr( 'role', 'alert' );
        } else if ( kind === 'notice' ) {
-               $icon = new OO.ui.IconWidget( { icon: 'info' } ).$element;
+               $icon = new OO.ui.IconWidget( { icon: 'notice' } ).$element;
        } else {
                $icon = '';
        }