jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.1.0-pre (24ac83a472) ......................................................................
Update OOjs UI to v0.1.0-pre (24ac83a472) New changes: 91a7fab build: Bump miscellaneous devDependencies to latest 18c32c5 Localisation updates from https://translatewiki.net. 283e2a1 When updating the ideal size while not clipping, set that size 6c862e8 Update width of TextInputMenuWidget before fitting labels, not after Change-Id: If825e0ec0e294b2569c98b5340be436ba896eceb --- M resources/lib/oojs-ui/i18n/hy.json M resources/lib/oojs-ui/oojs-ui-apex.css M resources/lib/oojs-ui/oojs-ui-minerva.css M resources/lib/oojs-ui/oojs-ui.js M resources/lib/oojs-ui/oojs-ui.svg.css 5 files changed, 27 insertions(+), 17 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/lib/oojs-ui/i18n/hy.json b/resources/lib/oojs-ui/i18n/hy.json index a6705d0..ebb2860 100644 --- a/resources/lib/oojs-ui/i18n/hy.json +++ b/resources/lib/oojs-ui/i18n/hy.json @@ -2,12 +2,17 @@ "@metadata": { "authors": [ "Vacio", - "Xelgen" + "Xelgen", + "Դավիթ Սարոյան" ] }, - "ooui-dialog-action-close": "Փակել", "ooui-outline-control-move-down": "Իջեցնել կետը", "ooui-outline-control-move-up": "Բարձրացնել կետը", "ooui-outline-control-remove": "Հեռացնել տարրը", - "ooui-toolbar-more": "Ավելին" + "ooui-toolbar-more": "Ավելին", + "ooui-dialog-message-accept": "Լավ", + "ooui-dialog-message-reject": "Չեղարկել", + "ooui-dialog-process-error": "Ինչ-որ սխալ է տեղի ունեցել", + "ooui-dialog-process-dismiss": "Փակել", + "ooui-dialog-process-retry": "Կրկին փորձել" } diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css b/resources/lib/oojs-ui/oojs-ui-apex.css index 53e46d6..efda815 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 (49b64bdba7) + * OOjs UI v0.1.0-pre (24ac83a472) * 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-15T22:18:37Z + * Date: 2014-09-17T18:23:50Z */ /* * Blank theme mixins. diff --git a/resources/lib/oojs-ui/oojs-ui-minerva.css b/resources/lib/oojs-ui/oojs-ui-minerva.css index e817142..906df74 100644 --- a/resources/lib/oojs-ui/oojs-ui-minerva.css +++ b/resources/lib/oojs-ui/oojs-ui-minerva.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (49b64bdba7) + * OOjs UI v0.1.0-pre (24ac83a472) * 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-15T22:18:37Z + * Date: 2014-09-17T18:23:50Z */ /* * Blank theme mixins. diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index a3e2375..0921aa9 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 (49b64bdba7) + * OOjs UI v0.1.0-pre (24ac83a472) * 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-15T22:18:37Z + * Date: 2014-09-17T18:23:50Z */ ( function ( OO ) { @@ -4725,7 +4725,7 @@ }; /** - * Set the ideal size. + * Set the ideal size. These are the dimensions the element will have when it's not being clipped. * * @param {number|string} [width] Width as a number of pixels or CSS string with unit suffix * @param {number|string} [height] Height as a number of pixels or CSS string with unit suffix @@ -4733,6 +4733,12 @@ OO.ui.ClippableElement.prototype.setIdealSize = function ( width, height ) { this.idealWidth = width; this.idealHeight = height; + + if ( !this.clipping ) { + // Update dimensions + this.$clippable.css( { width: width, height: height } ); + } + // While clipping, idealWidth and idealHeight are not considered }; /** @@ -11091,18 +11097,17 @@ var change = visible !== this.isVisible(); - // Parent method - OO.ui.TextInputMenuWidget.super.prototype.toggle.call( this, visible ); - if ( change ) { - if ( this.isVisible() ) { + if ( visible ) { this.position(); this.$( this.getElementWindow() ).on( 'resize', this.onWindowResizeHandler ); } else { this.$( this.getElementWindow() ).off( 'resize', this.onWindowResizeHandler ); } } - return this; + + // Parent method + return OO.ui.TextInputMenuWidget.super.prototype.toggle.call( this, visible ); }; /** diff --git a/resources/lib/oojs-ui/oojs-ui.svg.css b/resources/lib/oojs-ui/oojs-ui.svg.css index 913d5fd..6541427 100644 --- a/resources/lib/oojs-ui/oojs-ui.svg.css +++ b/resources/lib/oojs-ui/oojs-ui.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (49b64bdba7) + * OOjs UI v0.1.0-pre (24ac83a472) * 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-15T22:18:37Z + * Date: 2014-09-17T18:23:50Z */ /* * Blank theme mixins. -- To view, visit https://gerrit.wikimedia.org/r/161009 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If825e0ec0e294b2569c98b5340be436ba896eceb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> Gerrit-Reviewer: Catrope <[email protected]> Gerrit-Reviewer: Jack Phoenix <[email protected]> Gerrit-Reviewer: Krinkle <[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
