jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.1.0-pre (23565e7519) ......................................................................
Update OOjs UI to v0.1.0-pre (23565e7519) New changes: 0557719 Use README.md as doxygen main page 290f8a9 Remove accidental double try-catch from 76800b47 e7039d0 Revert "Revert "Show the modal overlay as soon as openWindow is called"" 61ac646 Fix lots of spelling mistakes and typos 5b381ae build: Create a 'typos' task to detect common typos f21c8eb FieldLayout: Only use <label> for InputWidgets 39e8522 Localisation updates from https://translatewiki.net. 16eb98d PHP: Reject malformed and potentially evil input when outputting HTML Change-Id: Ie039a451cf03eaf21e16538cfca270b1d9b8f7f9 --- M resources/lib/oojs-ui/i18n/es.json M resources/lib/oojs-ui/i18n/fr.json M resources/lib/oojs-ui/i18n/om.json M resources/lib/oojs-ui/oojs-ui-apex.css M resources/lib/oojs-ui/oojs-ui-apex.js M resources/lib/oojs-ui/oojs-ui-apex.svg.css M resources/lib/oojs-ui/oojs-ui-mediawiki.css M resources/lib/oojs-ui/oojs-ui-mediawiki.js M resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css M resources/lib/oojs-ui/oojs-ui.js 10 files changed, 108 insertions(+), 80 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/lib/oojs-ui/i18n/es.json b/resources/lib/oojs-ui/i18n/es.json index 82699a3..915791e 100644 --- a/resources/lib/oojs-ui/i18n/es.json +++ b/resources/lib/oojs-ui/i18n/es.json @@ -28,5 +28,6 @@ "ooui-dialog-message-reject": "Cancelar", "ooui-dialog-process-error": "Algo salió mal", "ooui-dialog-process-dismiss": "Descartar", - "ooui-dialog-process-retry": "Intentar de nuevo" + "ooui-dialog-process-retry": "Intentar de nuevo", + "ooui-dialog-process-continue": "Continuar" } diff --git a/resources/lib/oojs-ui/i18n/fr.json b/resources/lib/oojs-ui/i18n/fr.json index def0346..9144cb0 100644 --- a/resources/lib/oojs-ui/i18n/fr.json +++ b/resources/lib/oojs-ui/i18n/fr.json @@ -26,7 +26,8 @@ "Urhixidur", "Verdy p", "Wyz", - "SnowedEarth" + "SnowedEarth", + "Jdforrester" ] }, "ooui-outline-control-move-down": "Faire descendre l’élément", @@ -34,9 +35,11 @@ "ooui-outline-control-remove": "Supprimer l’élément", "ooui-toolbar-more": "Plus", "ooui-toolgroup-expand": "Plus", + "ooui-toolgroup-collapse": "Moins", "ooui-dialog-message-accept": "OK", "ooui-dialog-message-reject": "Annuler", "ooui-dialog-process-error": "Quelque chose a mal tourné", "ooui-dialog-process-dismiss": "Rejeter", - "ooui-dialog-process-retry": "Réessayez" + "ooui-dialog-process-retry": "Réessayez", + "ooui-dialog-process-continue": "Continuer" } diff --git a/resources/lib/oojs-ui/i18n/om.json b/resources/lib/oojs-ui/i18n/om.json index c62782e..ecf9597 100644 --- a/resources/lib/oojs-ui/i18n/om.json +++ b/resources/lib/oojs-ui/i18n/om.json @@ -9,9 +9,12 @@ "ooui-outline-control-move-up": "Ol baasi", "ooui-outline-control-remove": "Balleessi", "ooui-toolbar-more": "Dabalata", + "ooui-toolgroup-expand": "Dabalata", + "ooui-toolgroup-collapse": "Xiqqaa", "ooui-dialog-message-accept": "Tole", "ooui-dialog-message-reject": "Dhiisi", "ooui-dialog-process-error": "Dogoggorri wayii ummameera", "ooui-dialog-process-dismiss": "Didi", - "ooui-dialog-process-retry": "Itti deebi'ii yaali" + "ooui-dialog-process-retry": "Itti deebi'ii yaali", + "ooui-dialog-process-continue": "Itti fufi" } diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css b/resources/lib/oojs-ui/oojs-ui-apex.css index 6af125f..eb46d19 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.css +++ b/resources/lib/oojs-ui/oojs-ui-apex.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (d4cfcce969) + * OOjs UI v0.1.0-pre (23565e7519) * 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-21T00:12:46Z + * Date: 2014-11-21T22:18:30Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; @@ -2025,7 +2025,7 @@ height: 0; overflow: hidden; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { width: auto; height: auto; top: 0; @@ -2042,10 +2042,14 @@ overflow: hidden; max-width: 100%; max-height: 100%; + visibility: visible; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup > .oo-ui-window-frame > iframe { width: 100%; height: 100%; +} +.oo-ui-windowManager-modal > .oo-ui-dialog > .oo-ui-window-frame { + visibility: hidden; } .oo-ui-windowManager-fullscreen > .oo-ui-dialog > .oo-ui-window-frame { width: 100%; @@ -2077,7 +2081,7 @@ -o-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { opacity: 1; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index 3d06808..9da52ac 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.js +++ b/resources/lib/oojs-ui/oojs-ui-apex.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (d4cfcce969) + * OOjs UI v0.1.0-pre (23565e7519) * 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-21T00:12:34Z + * Date: 2014-11-21T22:18:20Z */ /* Instantiation */ diff --git a/resources/lib/oojs-ui/oojs-ui-apex.svg.css b/resources/lib/oojs-ui/oojs-ui-apex.svg.css index a3a7e34..d677c6c 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.svg.css +++ b/resources/lib/oojs-ui/oojs-ui-apex.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (d4cfcce969) + * OOjs UI v0.1.0-pre (23565e7519) * 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-21T00:12:46Z + * Date: 2014-11-21T22:18:30Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; @@ -2025,7 +2025,7 @@ height: 0; overflow: hidden; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { width: auto; height: auto; top: 0; @@ -2042,10 +2042,14 @@ overflow: hidden; max-width: 100%; max-height: 100%; + visibility: visible; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup > .oo-ui-window-frame > iframe { width: 100%; height: 100%; +} +.oo-ui-windowManager-modal > .oo-ui-dialog > .oo-ui-window-frame { + visibility: hidden; } .oo-ui-windowManager-fullscreen > .oo-ui-dialog > .oo-ui-window-frame { width: 100%; @@ -2077,7 +2081,7 @@ -o-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { opacity: 1; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-mediawiki.css index de3a155..81bd5dd 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki.css +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (d4cfcce969) + * OOjs UI v0.1.0-pre (23565e7519) * 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-21T00:12:46Z + * Date: 2014-11-21T22:18:30Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; @@ -1896,7 +1896,7 @@ height: 0; overflow: hidden; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { width: auto; height: auto; top: 0; @@ -1913,10 +1913,14 @@ overflow: hidden; max-width: 100%; max-height: 100%; + visibility: visible; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup > .oo-ui-window-frame > iframe { width: 100%; height: 100%; +} +.oo-ui-windowManager-modal > .oo-ui-dialog > .oo-ui-window-frame { + visibility: hidden; } .oo-ui-windowManager-fullscreen > .oo-ui-dialog > .oo-ui-window-frame { width: 100%; @@ -1948,7 +1952,7 @@ -o-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { opacity: 1; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index 00ac351..3986dcf 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki.js +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (d4cfcce969) + * OOjs UI v0.1.0-pre (23565e7519) * 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-21T00:12:34Z + * Date: 2014-11-21T22:18:20Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css b/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css index 2b5dfa1..60ab55d 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (d4cfcce969) + * OOjs UI v0.1.0-pre (23565e7519) * 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-21T00:12:46Z + * Date: 2014-11-21T22:18:30Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; @@ -1896,7 +1896,7 @@ height: 0; overflow: hidden; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { width: auto; height: auto; top: 0; @@ -1913,10 +1913,14 @@ overflow: hidden; max-width: 100%; max-height: 100%; + visibility: visible; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup > .oo-ui-window-frame > iframe { width: 100%; height: 100%; +} +.oo-ui-windowManager-modal > .oo-ui-dialog > .oo-ui-window-frame { + visibility: hidden; } .oo-ui-windowManager-fullscreen > .oo-ui-dialog > .oo-ui-window-frame { width: 100%; @@ -1948,7 +1952,7 @@ -o-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready { +.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load { opacity: 1; } .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready > .oo-ui-window-frame { diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index a7d4fc2..9b2c13f 100644 --- a/resources/lib/oojs-ui/oojs-ui.js +++ b/resources/lib/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (d4cfcce969) + * OOjs UI v0.1.0-pre (23565e7519) * 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-21T00:12:34Z + * Date: 2014-11-21T22:18:20Z */ ( function ( OO ) { @@ -101,7 +101,7 @@ * * @param {HTMLElement|HTMLElement[]} containers Container node(s) to search in * @param {HTMLElement} contained Node to find - * @param {boolean} [matchContainers] Include the container(s) in the list of nodes to match, otherwise only match descendents + * @param {boolean} [matchContainers] Include the container(s) in the list of nodes to match, otherwise only match descendants * @return {boolean} The node is in the list of target nodes */ OO.ui.contains = function ( containers, contained, matchContainers ) { @@ -314,7 +314,7 @@ * @param {Object} [config] Configuration options */ OO.ui.ActionSet = function OoUiActionSet( config ) { - // Configuration intialization + // Configuration initialization config = config || {}; // Mixin constructors @@ -656,7 +656,7 @@ /** * Organize actions. * - * This is called whenver organized information is requested. It will only reorganize the actions + * This is called whenever organized information is requested. It will only reorganize the actions * if something has changed since the last time it ran. * * @private @@ -673,7 +673,7 @@ for ( i = 0, iLen = this.list.length; i < iLen; i++ ) { action = this.list[i]; if ( action.isVisible() ) { - // Populate catgeories + // Populate categories for ( category in this.categories ) { if ( !this.categorized[category] ) { this.categorized[category] = {}; @@ -1158,7 +1158,7 @@ /** * Update the theme-provided classes. * - * @localdoc This is called in element mixins and widget classes anytime state changes. + * @localdoc This is called in element mixins and widget classes any time state changes. * Updating is debounced, minimizing overhead of changing multiple attributes and * guaranteeing that theme updates do not occur within an element's constructor */ @@ -1451,8 +1451,8 @@ * * Each process (setup, ready, hold and teardown) can be extended in subclasses by overriding * {@link #getSetupProcess}, {@link #getReadyProcess}, {@link #getHoldProcess} and - * {@link #getTeardownProcess} respectively. Each process is executed in series, so asynchonous - * processing can complete. Always assume window processes are executed asychronously. See + * {@link #getTeardownProcess} respectively. Each process is executed in series, so asynchronous + * processing can complete. Always assume window processes are executed asynchronously. See * OO.ui.Process for more details about how to work with processes. Some events, as well as the * #open and #close methods, provide promises which are resolved when the window enters a new state. * @@ -1463,7 +1463,6 @@ * @param {Object} [config] Configuration options * @cfg {string} [size] Symbolic name of dialog size, `small`, `medium`, `large` or `full`; omit to * use #static-size - * @fires initialize */ OO.ui.Window = function OoUiWindow( config ) { // Configuration initialization @@ -1495,7 +1494,7 @@ this.$frame.addClass( 'oo-ui-window-frame' ); this.$overlay.addClass( 'oo-ui-window-overlay' ); - // NOTE: Additional intitialization will occur when #setManager is called + // NOTE: Additional initialization will occur when #setManager is called }; /* Setup */ @@ -1841,11 +1840,11 @@ /** * Toggle visibility of window. * - * If the window is isolated and hasn't fully loaded yet, the visiblity property will be used + * If the window is isolated and hasn't fully loaded yet, the visibility property will be used * instead of display. * * @param {boolean} [show] Make window visible, omit to toggle visibility - * @fires visible + * @fires toggle * @chainable */ OO.ui.Window.prototype.toggle = function ( show ) { @@ -2014,7 +2013,7 @@ /** * Setup window. * - * This is called by OO.ui.WindowManager durring window opening, and should not be called directly + * This is called by OO.ui.WindowManager during window opening, and should not be called directly * by other systems. * * @param {Object} [data] Window opening data @@ -2039,7 +2038,7 @@ /** * Ready window. * - * This is called by OO.ui.WindowManager durring window opening, and should not be called directly + * This is called by OO.ui.WindowManager during window opening, and should not be called directly * by other systems. * * @param {Object} [data] Window opening data @@ -2063,7 +2062,7 @@ /** * Hold window. * - * This is called by OO.ui.WindowManager durring window closing, and should not be called directly + * This is called by OO.ui.WindowManager during window closing, and should not be called directly * by other systems. * * @param {Object} [data] Window closing data @@ -2094,7 +2093,7 @@ /** * Teardown window. * - * This is called by OO.ui.WindowManager durring window closing, and should not be called directly + * This is called by OO.ui.WindowManager during window closing, and should not be called directly * by other systems. * * @param {Object} [data] Window closing data @@ -2106,7 +2105,7 @@ this.getTeardownProcess( data ).execute().done( function () { // Force redraw by asking the browser to measure the elements' widths - win.$element.removeClass( 'oo-ui-window-setup' ).width(); + win.$element.removeClass( 'oo-ui-window-load oo-ui-window-setup' ).width(); win.$content.removeClass( 'oo-ui-window-content-setup' ).width(); win.$element.hide(); win.visible = false; @@ -2119,10 +2118,9 @@ /** * Load the frame contents. * - * Once the iframe's stylesheets are loaded, the `load` event will be emitted and the returned - * promise will be resolved. Calling while loading will return a promise but not trigger a new - * loading cycle. Calling after loading is complete will return a promise that's already been - * resolved. + * Once the iframe's stylesheets are loaded the returned promise will be resolved. Calling while + * loading will return a promise but not trigger a new loading cycle. Calling after loading is + * complete will return a promise that's already been resolved. * * Sounds simple right? Read on... * @@ -2151,11 +2149,12 @@ * All this stylesheet injection and polling magic is in #transplantStyles. * * @return {jQuery.Promise} Promise resolved when loading is complete - * @fires load */ OO.ui.Window.prototype.load = function () { var sub, doc, loading, win = this; + + this.$element.addClass( 'oo-ui-window-load' ); // Non-isolated windows are already "loaded" if ( !this.loading && !this.isolated ) { @@ -2880,13 +2879,10 @@ // Window opening if ( opening.state() !== 'rejected' ) { - // Begin loading the window if it's not loading or loaded already - may take noticable time - // and we want to do this in parallel with any other preparatory actions - if ( !win.isLoading() && !win.isLoaded() ) { - // Finish initializing the window (must be done after manager is attached to DOM) + if ( !win.getManager() ) { win.setManager( this ); - preparing.push( win.load() ); } + preparing.push( win.load() ); if ( this.closing ) { // If a window is currently closing, wait for it to complete @@ -3166,7 +3162,7 @@ .attr( 'aria-hidden', '' ); } } else if ( this.$ariaHidden ) { - // Restore screen reader visiblity + // Restore screen reader visibility this.$ariaHidden.removeAttr( 'aria-hidden' ); this.$ariaHidden = null; } @@ -3596,7 +3592,7 @@ /** * Update CSS classes provided by the theme. * - * For elements with theme logic hooks, this should be called anytime there's a state change. + * For elements with theme logic hooks, this should be called any time there's a state change. * * @param {OO.ui.Element} element Element for which to update classes * @return {Object.<string,string[]>} Categorized class names with `on` and `off` lists @@ -3715,7 +3711,7 @@ if ( this.isDisabled() || e.which !== 1 ) { return false; } - // Restore the tab-index after the button is up to restore the button's accesssibility + // Restore the tab-index after the button is up to restore the button's accessibility this.$button.attr( 'tabindex', this.tabIndex ); this.$element.removeClass( 'oo-ui-buttonElement-pressed' ); // Stop listening for mouseup, since we only needed this once @@ -3818,7 +3814,7 @@ * @cfg {jQuery} [$group] Container node, assigned to #$group, omit to use a generated `<div>` */ OO.ui.GroupElement = function OoUiGroupElement( config ) { - // Configuration intialization + // Configuration initialization config = config || {}; // Properties @@ -4056,7 +4052,7 @@ * @cfg {string} [iconTitle] Icon title text or a function that returns text */ OO.ui.IconElement = function OoUiIconElement( config ) { - // Configuration intialization + // Configuration initialization config = config || {}; // Properties @@ -5816,7 +5812,7 @@ * Dialog title. * * A confirmation dialog's title should describe what the progressive action will do. An alert - * dialog's title should describe what event occured. + * dialog's title should describe what event occurred. * * @static * inheritable @@ -5826,7 +5822,7 @@ /** * A confirmation dialog's message should describe the consequences of the progressive action. An - * alert dialog's message should describe why the event occured. + * alert dialog's message should describe why the event occurred. * * @static * inheritable @@ -6172,7 +6168,7 @@ }; /** - * Handle errors that occured durring accept or reject processes. + * Handle errors that occurred during accept or reject processes. * * @param {OO.ui.Error[]} errors Errors to be handled */ @@ -6448,7 +6444,7 @@ /** * Get the outline widget. * - * @return {OO.ui.OutlineSelectWidget|null} Outline widget, or null if boolet has no outline + * @return {OO.ui.OutlineSelectWidget|null} Outline widget, or null if booklet has no outline */ OO.ui.BookletLayout.prototype.getOutline = function () { return this.outlineSelectWidget; @@ -6673,6 +6669,9 @@ // Configuration initialization config = $.extend( { align: 'left' }, config ); + // Properties (must be set before parent constructor, which calls #getTagName) + this.fieldWidget = fieldWidget; + // Parent constructor OO.ui.FieldLayout.super.call( this, config ); @@ -6681,7 +6680,6 @@ // Properties this.$field = this.$( '<div>' ); - this.fieldWidget = fieldWidget; this.align = null; if ( config.help ) { this.popupButtonWidget = new OO.ui.PopupButtonWidget( { @@ -6721,11 +6719,18 @@ OO.inheritClass( OO.ui.FieldLayout, OO.ui.Layout ); OO.mixinClass( OO.ui.FieldLayout, OO.ui.LabelElement ); -/* Static Properties */ - -OO.ui.FieldLayout.static.tagName = 'label'; - /* Methods */ + +/** + * @inheritdoc + */ +OO.ui.FieldLayout.prototype.getTagName = function () { + if ( this.fieldWidget instanceof OO.ui.InputWidget ) { + return 'label'; + } else { + return 'div'; + } +}; /** * Handle field disable events. @@ -7042,7 +7047,7 @@ * * @param {number} x Horizontal position * @param {number} y Vertical position - * @return {OO.ui.PanelLayout} The panel at the given postion + * @return {OO.ui.PanelLayout} The panel at the given position */ OO.ui.GridLayout.prototype.getPanel = function ( x, y ) { return this.panels[ ( x * this.widths.length ) + y ]; @@ -7592,7 +7597,7 @@ * @cfg {boolean} [expanded=false] Whether the collapsible tools are expanded by default */ OO.ui.ListToolGroup = function OoUiListToolGroup( toolbar, config ) { - // Configuration intialization + // Configuration initialization config = config || {}; // Properties (must be set before parent constructor, which calls #populate) @@ -7869,7 +7874,7 @@ * Mixin for widgets used as items in widgets that inherit OO.ui.GroupWidget. * * Item widgets have a reference to a OO.ui.GroupWidget while they are attached to the group. This - * allows bidrectional communication. + * allows bidirectional communication. * * Use together with OO.ui.GroupWidget to make disabled state inheritable. * @@ -9311,7 +9316,7 @@ * @return {jQuery} Input element */ OO.ui.ButtonInputWidget.prototype.getInputElement = function ( config ) { - // Configuration intialization + // Configuration initialization config = config || {}; var html = '<' + ( config.useInputTag ? 'input' : 'button' ) + ' type="' + config.type + '">'; @@ -9639,7 +9644,7 @@ /** * Set the read-only state of the widget. * - * This should probably change the widgets's appearance and prevent it from being used. + * This should probably change the widget's appearance and prevent it from being used. * * @param {boolean} state Make input read-only * @chainable @@ -10338,7 +10343,7 @@ /** * Check if item is movable. * - * Movablilty is used by outline controls. + * Movability is used by outline controls. * * @return {boolean} Item is movable */ @@ -10349,7 +10354,7 @@ /** * Check if item is removable. * - * Removablilty is used by outline controls. + * Removability is used by outline controls. * * @return {boolean} Item is removable */ @@ -10369,7 +10374,7 @@ /** * Set movability. * - * Movablilty is used by outline controls. + * Movability is used by outline controls. * * @param {boolean} movable Item is movable * @chainable @@ -10383,7 +10388,7 @@ /** * Set removability. * - * Removablilty is used by outline controls. + * Removability is used by outline controls. * * @param {boolean} movable Item is removable * @chainable @@ -10788,7 +10793,7 @@ * @cfg {string} [value] Initial query value */ OO.ui.SearchWidget = function OoUiSearchWidget( config ) { - // Configuration intialization + // Configuration initialization config = config || {}; // Parent constructor @@ -11180,10 +11185,10 @@ }; /** - * Get an existing item with equivilant data. + * Get an existing item with equivalent data. * * @param {Object} data Item data to search for - * @return {OO.ui.OptionWidget|null} Item with equivilent value, `null` if none exists + * @return {OO.ui.OptionWidget|null} Item with equivalent value, `null` if none exists */ OO.ui.SelectWidget.prototype.getItemFromData = function ( data ) { var hash = OO.getHash( data ); @@ -11342,7 +11347,7 @@ /** * Get the next selectable item. * - * @return {OO.ui.OptionWidget|null} Item, `null` if ther aren't any selectable items + * @return {OO.ui.OptionWidget|null} Item, `null` if there aren't any selectable items */ OO.ui.SelectWidget.prototype.getFirstSelectableItem = function () { var i, len, item; @@ -11775,7 +11780,7 @@ * @cfg {jQuery} [$container=input.$element] Element to render menu under */ OO.ui.TextInputMenuSelectWidget = function OoUiTextInputMenuSelectWidget( input, config ) { - // Configuration intialization + // Configuration initialization config = config || {}; // Parent constructor -- To view, visit https://gerrit.wikimedia.org/r/175135 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie039a451cf03eaf21e16538cfca270b1d9b8f7f9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
