jenkins-bot has submitted this change and it was merged.
Change subject: Update OOjs UI to v0.1.0-pre (b38d485723)
......................................................................
Update OOjs UI to v0.1.0-pre (b38d485723)
New changes:
5a88296 Further mute keyboard shortcuts when disabled
0cdba98 Allow errors to be warnings, and give continue rather than retry button
31a1cbb Normalize configuration initialization
42ce966 Populate LookupInputWidget on mousedown too
3ed0d9c Removing text-shadow from readonly/disabled text in TextInputWidget
68eb012 Add missing message docs for ooui-dialog-process-continue
Change-Id: Ie55491851f7509295fdddbc5229bab2a32e83e8e
---
M lib/oojs-ui/i18n/en.json
M lib/oojs-ui/i18n/qqq.json
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-apex.svg.css
M lib/oojs-ui/oojs-ui-apex.svg.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.css
M lib/oojs-ui/oojs-ui-mediawiki.js
M lib/oojs-ui/oojs-ui-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.svg.css
M lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css
M lib/oojs-ui/oojs-ui.js
13 files changed, 124 insertions(+), 65 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/oojs-ui/i18n/en.json b/lib/oojs-ui/i18n/en.json
index d1abd47..1db3fd8 100644
--- a/lib/oojs-ui/i18n/en.json
+++ b/lib/oojs-ui/i18n/en.json
@@ -26,5 +26,6 @@
"ooui-dialog-message-reject": "Cancel",
"ooui-dialog-process-error": "Something went wrong",
"ooui-dialog-process-dismiss": "Dismiss",
- "ooui-dialog-process-retry": "Try again"
+ "ooui-dialog-process-retry": "Try again",
+ "ooui-dialog-process-continue": "Continue"
}
diff --git a/lib/oojs-ui/i18n/qqq.json b/lib/oojs-ui/i18n/qqq.json
index 43da562..c1b794a 100644
--- a/lib/oojs-ui/i18n/qqq.json
+++ b/lib/oojs-ui/i18n/qqq.json
@@ -30,5 +30,6 @@
"ooui-dialog-message-reject": "Default label for the reject button of a
message dialog\n{{Identical|Cancel}}",
"ooui-dialog-process-error": "Title for process dialog error
description",
"ooui-dialog-process-dismiss": "Label for process dialog dismiss error
button, visible when describing errors\n{{Identical|Dismiss}}",
- "ooui-dialog-process-retry": "Label for process dialog retry action
button, visible when describing recoverable errors\n{{Identical|Try again}}"
+ "ooui-dialog-process-retry": "Label for process dialog retry action
button, visible when describing recoverable errors\n{{Identical|Try again}}",
+ "ooui-dialog-process-continue": "Label for process dialog retry action
button, visible when describing only warnings\n{{Identical|Continue}}"
}
diff --git a/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css
index f8e984c..3d6f0bf 100644
--- a/lib/oojs-ui/oojs-ui-apex.css
+++ b/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (571f26d0ab)
+ * OOjs UI v0.1.0-pre (b38d485723)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-03T21:03:24Z
+ * Date: 2014-11-04T22:43:01Z
*/
/* @noflip */
.oo-ui-rtl {
@@ -726,6 +726,9 @@
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-tool-title {
color: #cccccc;
}
+.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-tool-title .oo-ui-tool-accel {
+ color: #dddddd;
+}
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-iconElement-icon {
opacity: 0.2;
}
@@ -1327,7 +1330,6 @@
.oo-ui-textInputWidget input[readonly],
.oo-ui-textInputWidget textarea[readonly] {
color: #777777;
- text-shadow: 0 1px 1px #ffffff;
}
.oo-ui-textInputWidget.oo-ui-pendingElement-pending input,
.oo-ui-textInputWidget.oo-ui-pendingElement-pending textarea {
diff --git a/lib/oojs-ui/oojs-ui-apex.js b/lib/oojs-ui/oojs-ui-apex.js
index 6bc9eda..2c1629f 100644
--- a/lib/oojs-ui/oojs-ui-apex.js
+++ b/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (571f26d0ab)
+ * OOjs UI v0.1.0-pre (b38d485723)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-03T21:03:14Z
+ * Date: 2014-11-04T22:42:51Z
*/
/* Instantiation */
diff --git a/lib/oojs-ui/oojs-ui-apex.rtl.css b/lib/oojs-ui/oojs-ui-apex.rtl.css
index 39a8c25..1976671 100644
--- a/lib/oojs-ui/oojs-ui-apex.rtl.css
+++ b/lib/oojs-ui/oojs-ui-apex.rtl.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (571f26d0ab)
+ * OOjs UI v0.1.0-pre (b38d485723)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-03T21:03:24Z
+ * Date: 2014-11-04T22:43:01Z
*/
/* @noflip */
.oo-ui-rtl {
@@ -726,6 +726,9 @@
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-tool-title {
color: #cccccc;
}
+.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-tool-title .oo-ui-tool-accel {
+ color: #dddddd;
+}
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-iconElement-icon {
opacity: 0.2;
}
@@ -1327,7 +1330,6 @@
.oo-ui-textInputWidget input[readonly],
.oo-ui-textInputWidget textarea[readonly] {
color: #777777;
- text-shadow: 0 1px 1px #ffffff;
}
.oo-ui-textInputWidget.oo-ui-pendingElement-pending input,
.oo-ui-textInputWidget.oo-ui-pendingElement-pending textarea {
diff --git a/lib/oojs-ui/oojs-ui-apex.svg.css b/lib/oojs-ui/oojs-ui-apex.svg.css
index 03867dc..abdec20 100644
--- a/lib/oojs-ui/oojs-ui-apex.svg.css
+++ b/lib/oojs-ui/oojs-ui-apex.svg.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (571f26d0ab)
+ * OOjs UI v0.1.0-pre (b38d485723)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-03T21:03:24Z
+ * Date: 2014-11-04T22:43:01Z
*/
/* @noflip */
.oo-ui-rtl {
@@ -726,6 +726,9 @@
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-tool-title {
color: #cccccc;
}
+.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-tool-title .oo-ui-tool-accel {
+ color: #dddddd;
+}
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-iconElement-icon {
opacity: 0.2;
}
@@ -1327,7 +1330,6 @@
.oo-ui-textInputWidget input[readonly],
.oo-ui-textInputWidget textarea[readonly] {
color: #777777;
- text-shadow: 0 1px 1px #ffffff;
}
.oo-ui-textInputWidget.oo-ui-pendingElement-pending input,
.oo-ui-textInputWidget.oo-ui-pendingElement-pending textarea {
diff --git a/lib/oojs-ui/oojs-ui-apex.svg.rtl.css
b/lib/oojs-ui/oojs-ui-apex.svg.rtl.css
index 4408250..1b1da4a 100644
--- a/lib/oojs-ui/oojs-ui-apex.svg.rtl.css
+++ b/lib/oojs-ui/oojs-ui-apex.svg.rtl.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (571f26d0ab)
+ * OOjs UI v0.1.0-pre (b38d485723)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-03T21:03:24Z
+ * Date: 2014-11-04T22:43:01Z
*/
/* @noflip */
.oo-ui-rtl {
@@ -726,6 +726,9 @@
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-tool-title {
color: #cccccc;
}
+.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-tool-title .oo-ui-tool-accel {
+ color: #dddddd;
+}
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-iconElement-icon {
opacity: 0.2;
}
@@ -1327,7 +1330,6 @@
.oo-ui-textInputWidget input[readonly],
.oo-ui-textInputWidget textarea[readonly] {
color: #777777;
- text-shadow: 0 1px 1px #ffffff;
}
.oo-ui-textInputWidget.oo-ui-pendingElement-pending input,
.oo-ui-textInputWidget.oo-ui-pendingElement-pending textarea {
diff --git a/lib/oojs-ui/oojs-ui-mediawiki.css
b/lib/oojs-ui/oojs-ui-mediawiki.css
index 426ffa2..c0accba 100644
--- a/lib/oojs-ui/oojs-ui-mediawiki.css
+++ b/lib/oojs-ui/oojs-ui-mediawiki.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (571f26d0ab)
+ * OOjs UI v0.1.0-pre (b38d485723)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-03T21:03:24Z
+ * Date: 2014-11-04T22:43:01Z
*/
/* @noflip */
.oo-ui-rtl {
@@ -627,6 +627,9 @@
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-tool-title {
color: #cccccc;
}
+.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-tool-title .oo-ui-tool-accel {
+ color: #dddddd;
+}
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-iconElement-icon {
opacity: 0.2;
}
diff --git a/lib/oojs-ui/oojs-ui-mediawiki.js b/lib/oojs-ui/oojs-ui-mediawiki.js
index a0262ab..de4144c 100644
--- a/lib/oojs-ui/oojs-ui-mediawiki.js
+++ b/lib/oojs-ui/oojs-ui-mediawiki.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (571f26d0ab)
+ * OOjs UI v0.1.0-pre (b38d485723)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-03T21:03:14Z
+ * Date: 2014-11-04T22:42:51Z
*/
/**
* @class
diff --git a/lib/oojs-ui/oojs-ui-mediawiki.rtl.css
b/lib/oojs-ui/oojs-ui-mediawiki.rtl.css
index 0de0701..981af19 100644
--- a/lib/oojs-ui/oojs-ui-mediawiki.rtl.css
+++ b/lib/oojs-ui/oojs-ui-mediawiki.rtl.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (571f26d0ab)
+ * OOjs UI v0.1.0-pre (b38d485723)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-03T21:03:24Z
+ * Date: 2014-11-04T22:43:01Z
*/
/* @noflip */
.oo-ui-rtl {
@@ -627,6 +627,9 @@
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-tool-title {
color: #cccccc;
}
+.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-tool-title .oo-ui-tool-accel {
+ color: #dddddd;
+}
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-iconElement-icon {
opacity: 0.2;
}
diff --git a/lib/oojs-ui/oojs-ui-mediawiki.svg.css
b/lib/oojs-ui/oojs-ui-mediawiki.svg.css
index 055f867..bf8a1ee 100644
--- a/lib/oojs-ui/oojs-ui-mediawiki.svg.css
+++ b/lib/oojs-ui/oojs-ui-mediawiki.svg.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (571f26d0ab)
+ * OOjs UI v0.1.0-pre (b38d485723)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-03T21:03:24Z
+ * Date: 2014-11-04T22:43:01Z
*/
/* @noflip */
.oo-ui-rtl {
@@ -627,6 +627,9 @@
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-tool-title {
color: #cccccc;
}
+.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-tool-title .oo-ui-tool-accel {
+ color: #dddddd;
+}
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-iconElement-icon {
opacity: 0.2;
}
diff --git a/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css
b/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css
index 5f8964a..0276e93 100644
--- a/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css
+++ b/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (571f26d0ab)
+ * OOjs UI v0.1.0-pre (b38d485723)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-03T21:03:24Z
+ * Date: 2014-11-04T22:43:01Z
*/
/* @noflip */
.oo-ui-rtl {
@@ -627,6 +627,9 @@
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-tool-title {
color: #cccccc;
}
+.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-tool-title .oo-ui-tool-accel {
+ color: #dddddd;
+}
.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link
.oo-ui-iconElement-icon {
opacity: 0.2;
}
diff --git a/lib/oojs-ui/oojs-ui.js b/lib/oojs-ui/oojs-ui.js
index 01e0bb4..eb38aa4 100644
--- a/lib/oojs-ui/oojs-ui.js
+++ b/lib/oojs-ui/oojs-ui.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (571f26d0ab)
+ * OOjs UI v0.1.0-pre (b38d485723)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-03T21:03:14Z
+ * Date: 2014-11-04T22:42:51Z
*/
( function ( OO ) {
@@ -123,8 +123,10 @@
'ooui-dialog-process-error': 'Something went wrong',
// Label for process dialog dismiss error button, visible when
describing errors
'ooui-dialog-process-dismiss': 'Dismiss',
- // Label for process dialog retry action button, visible when
describing recoverable errors
- 'ooui-dialog-process-retry': 'Try again'
+ // Label for process dialog retry action button, visible when
describing only recoverable errors
+ 'ooui-dialog-process-retry': 'Try again',
+ // Label for process dialog retry action button, visible when
describing only warnings
+ 'ooui-dialog-process-continue': 'Continue'
};
/**
@@ -202,7 +204,7 @@
* @param {Object} [config] Configuration options
*/
OO.ui.PendingElement = function OoUiPendingElement( config ) {
- // Config initialisation
+ // Configuration initialization
config = config || {};
// Properties
@@ -1257,7 +1259,7 @@
* @param {Object} [config] Configuration options
*/
OO.ui.Layout = function OoUiLayout( config ) {
- // Initialize config
+ // Configuration initialization
config = config || {};
// Parent constructor
@@ -3166,6 +3168,7 @@
* @param {string|jQuery} message Description of error
* @param {Object} [config] Configuration options
* @cfg {boolean} [recoverable=true] Error is recoverable
+ * @cfg {boolean} [warning=false] Whether this error is a warning or not.
*/
OO.ui.Error = function OoUiElement( message, config ) {
// Configuration initialization
@@ -3174,6 +3177,7 @@
// Properties
this.message = message instanceof jQuery ? message : String( message );
this.recoverable = config.recoverable === undefined ||
!!config.recoverable;
+ this.warning = !!config.warning;
};
/* Setup */
@@ -3189,6 +3193,15 @@
*/
OO.ui.Error.prototype.isRecoverable = function () {
return this.recoverable;
+};
+
+/**
+ * Check if the error is a warning
+ *
+ * @return {boolean} Error is warning
+ */
+OO.ui.Error.prototype.isWarning = function () {
+ return this.warning;
};
/**
@@ -3532,7 +3545,7 @@
* @param {Object} [config] Configuration options
*/
OO.ui.Theme = function OoUiTheme( config ) {
- // Initialize config
+ // Configuration initialization
config = config || {};
};
@@ -3780,7 +3793,7 @@
* @cfg {jQuery} [$group] Container node, assigned to #$group, omit to use a
generated `<div>`
*/
OO.ui.GroupElement = function OoUiGroupElement( config ) {
- // Configuration
+ // Configuration intialization
config = config || {};
// Properties
@@ -4018,7 +4031,7 @@
* @cfg {string} [iconTitle] Icon title text or a function that returns text
*/
OO.ui.IconElement = function OoUiIconElement( config ) {
- // Config intialization
+ // Configuration intialization
config = config || {};
// Properties
@@ -4175,7 +4188,7 @@
* @cfg {string} [indicatorTitle] Indicator title text or a function that
returns text
*/
OO.ui.IndicatorElement = function OoUiIndicatorElement( config ) {
- // Config intialization
+ // Configuration initialization
config = config || {};
// Properties
@@ -4322,7 +4335,7 @@
* @cfg {boolean} [autoFitLabel=true] Whether to fit the label or not.
*/
OO.ui.LabelElement = function OoUiLabelElement( config ) {
- // Config intialization
+ // Configuration initialization
config = config || {};
// Properties
@@ -4492,7 +4505,7 @@
* @cfg {jQuery} [$flagged] Flagged node, assigned to #$flagged, omit to use
#$element
*/
OO.ui.FlaggedElement = function OoUiFlaggedElement( config ) {
- // Config initialization
+ // Configuration initialization
config = config || {};
// Properties
@@ -4663,7 +4676,7 @@
* static property 'title' is used.
*/
OO.ui.TitledElement = function OoUiTitledElement( config ) {
- // Config intialization
+ // Configuration initialization
config = config || {};
// Properties
@@ -4958,7 +4971,7 @@
* @cfg {string|Function} [title] Title text or a function that returns text
*/
OO.ui.Tool = function OoUiTool( toolGroup, config ) {
- // Config intialization
+ // Configuration initialization
config = config || {};
// Parent constructor
@@ -6040,10 +6053,7 @@
$: this.$,
label: OO.ui.msg( 'ooui-dialog-process-dismiss' )
} );
- this.retryButton = new OO.ui.ButtonWidget( {
- $: this.$,
- label: OO.ui.msg( 'ooui-dialog-process-retry' )
- } );
+ this.retryButton = new OO.ui.ButtonWidget( { $: this.$ } );
this.$errors = this.$( '<div>' );
this.$errorsTitle = this.$( '<div>' );
@@ -6137,11 +6147,15 @@
OO.ui.ProcessDialog.prototype.showErrors = function ( errors ) {
var i, len, $item,
items = [],
- recoverable = true;
+ recoverable = true,
+ warning = false;
for ( i = 0, len = errors.length; i < len; i++ ) {
if ( !errors[i].isRecoverable() ) {
recoverable = false;
+ }
+ if ( errors[i].isWarning() ) {
+ warning = true;
}
$item = this.$( '<div>' )
.addClass( 'oo-ui-processDialog-error' )
@@ -6153,6 +6167,11 @@
this.retryButton.clearFlags().setFlags(
this.currentAction.getFlags() );
} else {
this.currentAction.setDisabled( true );
+ }
+ if ( warning ) {
+ this.retryButton.setLabel( OO.ui.msg(
'ooui-dialog-process-continue' ) );
+ } else {
+ this.retryButton.setLabel( OO.ui.msg(
'ooui-dialog-process-retry' ) );
}
this.retryButton.toggle( recoverable );
this.$errorsTitle.after( this.$errorItems );
@@ -6182,7 +6201,7 @@
* @cfg {boolean} [editable=false] Show controls for adding, removing and
reordering pages
*/
OO.ui.BookletLayout = function OoUiBookletLayout( config ) {
- // Initialize configuration
+ // Configuration initialization
config = config || {};
// Parent constructor
@@ -6619,7 +6638,7 @@
* @cfg {string} [help] Explanatory text shown as a '?' icon.
*/
OO.ui.FieldLayout = function OoUiFieldLayout( fieldWidget, config ) {
- // Config initialization
+ // Configuration initialization
config = $.extend( { align: 'left' }, config );
// Parent constructor
@@ -6754,7 +6773,7 @@
* @cfg {OO.ui.FieldLayout[]} [items] Items to add
*/
OO.ui.FieldsetLayout = function OoUiFieldsetLayout( config ) {
- // Config initialization
+ // Configuration initialization
config = config || {};
// Parent constructor
@@ -6855,7 +6874,7 @@
OO.ui.GridLayout = function OoUiGridLayout( panels, config ) {
var i, len, widths;
- // Config initialization
+ // Configuration initialization
config = config || {};
// Parent constructor
@@ -7010,7 +7029,7 @@
* @cfg {boolean} [expanded=true] Expand size to fill the entire parent element
*/
OO.ui.PanelLayout = function OoUiPanelLayout( config ) {
- // Config initialization
+ // Configuration initialization
config = $.extend( {
scrollable: false,
padded: false,
@@ -7165,7 +7184,7 @@
* @cfg {OO.ui.Layout[]} [items] Layouts to add
*/
OO.ui.StackLayout = function OoUiStackLayout( config ) {
- // Config initialization
+ // Configuration initialization
config = $.extend( { scrollable: true }, config );
// Parent constructor
@@ -7539,6 +7558,9 @@
* @cfg {boolean} [expanded=false] Whether the collapsible tools are expanded
by default
*/
OO.ui.ListToolGroup = function OoUiListToolGroup( toolbar, config ) {
+ // Configuration intialization
+ config = config || {};
+
// Properties (must be set before parent constructor, which calls
#populate)
this.allowCollapse = config.allowCollapse;
this.forceExpand = config.forceExpand;
@@ -7873,9 +7895,10 @@
* @param {OO.ui.TextInputWidget} input Input widget
* @param {Object} [config] Configuration options
* @cfg {jQuery} [$overlay] Overlay for dropdown; defaults to relative
positioning
+ * @cfg {jQuery} [$container=input.$element] Element to render menu under
*/
OO.ui.LookupInputWidget = function OoUiLookupInputWidget( input, config ) {
- // Config intialization
+ // Configuration initialization
config = config || {};
// Properties
@@ -7939,8 +7962,8 @@
// This way we allow the user to open the menu again after closing it
with Esc
// by clicking in the input. Opening (and populating) the menu when
initially
// clicking into the input is handled by the focus handler.
- if ( this.lookupInputFocused ) {
- this.openLookupMenu();
+ if ( this.lookupInputFocused && !this.lookupMenu.isVisible() ) {
+ this.populateLookupMenu();
}
};
@@ -8357,6 +8380,9 @@
* @cfg {OO.ui.ButtonWidget[]} [items] Buttons to add
*/
OO.ui.ButtonGroupWidget = function OoUiButtonGroupWidget( config ) {
+ // Configuration initialization
+ config = config || {};
+
// Parent constructor
OO.ui.ButtonGroupWidget.super.call( this, config );
@@ -8551,7 +8577,7 @@
* @cfg {boolean} [framed=false] Render button with a frame
*/
OO.ui.ActionWidget = function OoUiActionWidget( config ) {
- // Config intialization
+ // Configuration initialization
config = $.extend( { framed: false }, config );
// Parent constructor
@@ -8924,7 +8950,7 @@
* @param {Object} [config] Configuration options
*/
OO.ui.IconWidget = function OoUiIconWidget( config ) {
- // Config intialization
+ // Configuration initialization
config = config || {};
// Parent constructor
@@ -8962,7 +8988,7 @@
* @param {Object} [config] Configuration options
*/
OO.ui.IndicatorWidget = function OoUiIndicatorWidget( config ) {
- // Config intialization
+ // Configuration initialization
config = config || {};
// Parent constructor
@@ -9251,7 +9277,11 @@
* @return {jQuery} Input element
*/
OO.ui.ButtonInputWidget.prototype.getInputElement = function ( config ) {
+ // Configuration intialization
+ config = config || {};
+
var html = '<' + ( config.useInputTag ? 'input' : 'button' ) + '
type="' + config.type + '">';
+
return this.$( html );
};
@@ -9634,7 +9664,11 @@
* @return {jQuery} Input element
*/
OO.ui.TextInputWidget.prototype.getInputElement = function ( config ) {
+ // Configuration initialization
+ config = config || {};
+
var type = config.type || 'text';
+
return config.multiline ? this.$( '<textarea>' ) : this.$( '<input
type="' + type + '" />' );
};
@@ -9839,7 +9873,7 @@
* @param {Object} [config] Configuration options
*/
OO.ui.LabelWidget = function OoUiLabelWidget( config ) {
- // Config intialization
+ // Configuration initialization
config = config || {};
// Parent constructor
@@ -9897,7 +9931,7 @@
* @cfg {string} [rel] Value for `rel` attribute in DOM, allowing per-option
styling
*/
OO.ui.OptionWidget = function OoUiOptionWidget( data, config ) {
- // Config intialization
+ // Configuration initialization
config = config || {};
// Parent constructor
@@ -10240,7 +10274,7 @@
* @cfg {boolean} [movable] Allow modification from outline controls
*/
OO.ui.OutlineItemWidget = function OoUiOutlineItemWidget( data, config ) {
- // Config intialization
+ // Configuration initialization
config = config || {};
// Parent constructor
@@ -10377,7 +10411,7 @@
* @cfg {boolean} [padded] Add padding to the body
*/
OO.ui.PopupWidget = function OoUiPopupWidget( config ) {
- // Config intialization
+ // Configuration initialization
config = config || {};
// Parent constructor
@@ -10650,7 +10684,7 @@
* @cfg {number} [progress=0] Initial progress
*/
OO.ui.ProgressBarWidget = function OoUiProgressBarWidget( config ) {
- // Config intialization
+ // Configuration initialization
config = config || {};
// Parent constructor
@@ -10876,7 +10910,7 @@
* @cfg {OO.ui.OptionWidget[]} [items] Options to add
*/
OO.ui.SelectWidget = function OoUiSelectWidget( config ) {
- // Config intialization
+ // Configuration initialization
config = config || {};
// Parent constructor
@@ -11421,7 +11455,7 @@
* @cfg {boolean} [autoHide=true] Hide the menu when the mouse is pressed
outside the menu
*/
OO.ui.MenuWidget = function OoUiMenuWidget( config ) {
- // Config intialization
+ // Configuration initialization
config = config || {};
// Parent constructor
@@ -11703,6 +11737,9 @@
* @cfg {jQuery} [$container=input.$element] Element to render menu under
*/
OO.ui.TextInputMenuWidget = function OoUiTextInputMenuWidget( input, config ) {
+ // Configuration intialization
+ config = config || {};
+
// Parent constructor
OO.ui.TextInputMenuWidget.super.call( this, config );
@@ -11793,7 +11830,7 @@
* @param {Object} [config] Configuration options
*/
OO.ui.OutlineWidget = function OoUiOutlineWidget( config ) {
- // Config intialization
+ // Configuration initialization
config = config || {};
// Parent constructor
--
To view, visit https://gerrit.wikimedia.org/r/171143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie55491851f7509295fdddbc5229bab2a32e83e8e
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
