jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.1.0-pre (ec785c2c64) ......................................................................
Update OOjs UI to v0.1.0-pre (ec785c2c64) New changes: 09e9d2c Fix documentation lies about dialog labels ec785c2 Followup 6c862e8: position before AND after showing in TextInputMenuWidget Change-Id: Ia1c9aa039503f0f18ac1da7748e7f87bfcdf7092 --- M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui-minerva.css M lib/oojs-ui/oojs-ui-minerva.rtl.css M lib/oojs-ui/oojs-ui.js M lib/oojs-ui/oojs-ui.rtl.css M lib/oojs-ui/oojs-ui.svg.css M lib/oojs-ui/oojs-ui.svg.rtl.css 8 files changed, 29 insertions(+), 20 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css index 0b2825d..7d59f96 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 (24ac83a472) + * OOjs UI v0.1.0-pre (ec785c2c64) * 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-09-17T18:24:10Z + * Date: 2014-09-18T04:47:58Z */ /* * Blank theme mixins. diff --git a/lib/oojs-ui/oojs-ui-apex.rtl.css b/lib/oojs-ui/oojs-ui-apex.rtl.css index 26ca4f7..e566025 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 (24ac83a472) + * OOjs UI v0.1.0-pre (ec785c2c64) * 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-09-17T18:24:10Z + * Date: 2014-09-18T04:47:58Z */ /* * Blank theme mixins. diff --git a/lib/oojs-ui/oojs-ui-minerva.css b/lib/oojs-ui/oojs-ui-minerva.css index 59bf58d..79b96ae 100644 --- a/lib/oojs-ui/oojs-ui-minerva.css +++ b/lib/oojs-ui/oojs-ui-minerva.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (24ac83a472) + * OOjs UI v0.1.0-pre (ec785c2c64) * 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-09-17T18:24:10Z + * Date: 2014-09-18T04:47:58Z */ /* * Blank theme mixins. diff --git a/lib/oojs-ui/oojs-ui-minerva.rtl.css b/lib/oojs-ui/oojs-ui-minerva.rtl.css index bbfe738..78b8630 100644 --- a/lib/oojs-ui/oojs-ui-minerva.rtl.css +++ b/lib/oojs-ui/oojs-ui-minerva.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (24ac83a472) + * OOjs UI v0.1.0-pre (ec785c2c64) * 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-09-17T18:24:10Z + * Date: 2014-09-18T04:47:58Z */ /* * Blank theme mixins. diff --git a/lib/oojs-ui/oojs-ui.js b/lib/oojs-ui/oojs-ui.js index fe0fcc4..0597f6b 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 (24ac83a472) + * OOjs UI v0.1.0-pre (ec785c2c64) * 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-09-17T18:24:10Z + * Date: 2014-09-18T04:47:58Z */ ( function ( OO ) { @@ -2293,7 +2293,7 @@ * @inheritdoc * * @param {Object} [data] Dialog opening data - * @param {jQuery|string|Function|null} [data.label] Dialog label, omit to use #static-label + * @param {jQuery|string|Function|null} [data.title] Dialog title, omit to use #static-title * @param {Object[]} [data.actions] List of OO.ui.ActionWidget configuration options for each * action item, omit to use #static-actions */ @@ -11097,8 +11097,18 @@ var change = visible !== this.isVisible(); + if ( change && visible ) { + // Make sure the width is set before the parent method runs. + // After this we have to call this.position(); again to actually + // position ourselves correctly. + this.position(); + } + + // Parent method + OO.ui.TextInputMenuWidget.super.prototype.toggle.call( this, visible ); + if ( change ) { - if ( visible ) { + if ( this.isVisible() ) { this.position(); this.$( this.getElementWindow() ).on( 'resize', this.onWindowResizeHandler ); } else { @@ -11106,8 +11116,7 @@ } } - // Parent method - return OO.ui.TextInputMenuWidget.super.prototype.toggle.call( this, visible ); + return this; }; /** diff --git a/lib/oojs-ui/oojs-ui.rtl.css b/lib/oojs-ui/oojs-ui.rtl.css index 68e022e..931b08f 100644 --- a/lib/oojs-ui/oojs-ui.rtl.css +++ b/lib/oojs-ui/oojs-ui.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (24ac83a472) + * OOjs UI v0.1.0-pre (ec785c2c64) * 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-09-17T18:24:10Z + * Date: 2014-09-18T04:47:58Z */ /* * Blank theme mixins. diff --git a/lib/oojs-ui/oojs-ui.svg.css b/lib/oojs-ui/oojs-ui.svg.css index 89455d0..e108d7c 100644 --- a/lib/oojs-ui/oojs-ui.svg.css +++ b/lib/oojs-ui/oojs-ui.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (24ac83a472) + * OOjs UI v0.1.0-pre (ec785c2c64) * 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-09-17T18:24:10Z + * Date: 2014-09-18T04:47:58Z */ /* * Blank theme mixins. diff --git a/lib/oojs-ui/oojs-ui.svg.rtl.css b/lib/oojs-ui/oojs-ui.svg.rtl.css index afbb1aa..9053393 100644 --- a/lib/oojs-ui/oojs-ui.svg.rtl.css +++ b/lib/oojs-ui/oojs-ui.svg.rtl.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (24ac83a472) + * OOjs UI v0.1.0-pre (ec785c2c64) * 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-09-17T18:24:10Z + * Date: 2014-09-18T04:47:58Z */ /* * Blank theme mixins. -- To view, visit https://gerrit.wikimedia.org/r/161171 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia1c9aa039503f0f18ac1da7748e7f87bfcdf7092 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> Gerrit-Reviewer: Catrope <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
