jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.1.0-pre (bdbb9cfa55) ......................................................................
Update OOjs UI to v0.1.0-pre (bdbb9cfa55) New changes: 471a8ca Rename intro.js and outro.js to have .txt extensions 250b0eb Localisation updates from https://translatewiki.net. 1eed712 [BREAKING CHANGE] Return promise instead of taking callback argument 92b5be9 Add getLookupMenu method to LookupInputWidget mixin Change-Id: I16c2fa58c41bfb3a617dc0d469c50a8648e83a30 --- M resources/lib/oojs-ui/i18n/br.json M resources/lib/oojs-ui/oojs-ui.js M resources/lib/oojs-ui/oojs-ui.svg.css 3 files changed, 30 insertions(+), 17 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/lib/oojs-ui/i18n/br.json b/resources/lib/oojs-ui/i18n/br.json index 137322a..44247ca 100644 --- a/resources/lib/oojs-ui/i18n/br.json +++ b/resources/lib/oojs-ui/i18n/br.json @@ -8,5 +8,7 @@ }, "ooui-dialog-action-close": "Serriñ", "ooui-outline-control-move-down": "Lakaat an elfenn da ziskenn", - "ooui-outline-control-move-up": "Lakaat an elfenn da bignat" + "ooui-outline-control-move-up": "Lakaat an elfenn da bignat", + "ooui-outline-control-remove": "Tennañ an elfenn", + "ooui-toolbar-more": "Muioc'h" } diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index d965ffa..92d7378 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 (70f1886a35) + * OOjs UI v0.1.0-pre (bdbb9cfa55) * 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: Tue Apr 29 2014 17:13:10 GMT-0700 (PDT) + * Date: Wed Apr 30 2014 16:34:11 GMT-0700 (PDT) */ ( function ( OO ) { @@ -5769,6 +5769,15 @@ }; /** + * Get lookup menu. + * + * @return {OO.ui.TextInputMenuWidget} + */ +OO.ui.LookupInputWidget.prototype.getLookupMenu = function () { + return this.lookupMenu; +}; + +/** * Open the menu. * * @chainable @@ -6096,24 +6105,26 @@ * * While flashing, the visual style of the pressed state is removed if present. * - * @param {Function} [done] Callback to execute when flash effect is complete. + * @return {jQuery.Promise} Promise resolved when flashing is done */ -OO.ui.OptionWidget.prototype.flash = function ( done ) { - var $this = this.$element; +OO.ui.OptionWidget.prototype.flash = function () { + var $this = this.$element, + deferred = $.Deferred(); if ( !this.disabled && this.constructor.static.pressable ) { $this.removeClass( 'oo-ui-optionWidget-highlighted oo-ui-optionWidget-pressed' ); setTimeout( OO.ui.bind( function () { - $this.addClass( 'oo-ui-optionWidget-highlighted' ); - if ( done ) { - // Restore original classes - $this - .toggleClass( 'oo-ui-optionWidget-highlighted', this.highlighted ) - .toggleClass( 'oo-ui-optionWidget-pressed', this.pressed ); - setTimeout( done, 100 ); - } + // Restore original classes + $this + .toggleClass( 'oo-ui-optionWidget-highlighted', this.highlighted ) + .toggleClass( 'oo-ui-optionWidget-pressed', this.pressed ); + setTimeout( function () { + deferred.resolve(); + }, 100 ); }, this ), 100 ); } + + return deferred.promise(); }; /** @@ -6784,7 +6795,7 @@ if ( item && !this.flashing ) { this.flashing = true; - item.flash( OO.ui.bind( function () { + item.flash().done( OO.ui.bind( function () { this.hide(); this.flashing = false; }, this ) ); diff --git a/resources/lib/oojs-ui/oojs-ui.svg.css b/resources/lib/oojs-ui/oojs-ui.svg.css index d19eb80..3a5268d 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 (70f1886a35) + * OOjs UI v0.1.0-pre (bdbb9cfa55) * 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: Tue Apr 29 2014 17:13:10 GMT-0700 (PDT) + * Date: Wed Apr 30 2014 16:34:11 GMT-0700 (PDT) */ /* Textures */ -- To view, visit https://gerrit.wikimedia.org/r/130774 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I16c2fa58c41bfb3a617dc0d469c50a8648e83a30 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Catrope <roan.katt...@gmail.com> Gerrit-Reviewer: Jack Phoenix <j...@countervandalism.net> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Siebrand <siebr...@kitano.nl> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
