From: James D. Forrester Date: Thu, 13 Aug 2015 21:06:45 +0000 (-0700) Subject: Update OOjs UI to v0.12.4 X-Git-Tag: 1.31.0-rc.0~10435 X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=7678bc7a53ff0aecb317f70527daeb65c80eb76b;p=lhc%2Fweb%2Fwiklou.git Update OOjs UI to v0.12.4 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.12.4/History.md Change-Id: I3d5a027e06a6d81289988a5199e56a7b1b25d35c --- diff --git a/composer.json b/composer.json index fb3d91ba7f..005ae7f3fc 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "leafo/lessphp": "0.5.0", "liuggio/statsd-php-client": "1.0.16", "mediawiki/at-ease": "1.0.0", - "oojs/oojs-ui": "0.12.3", + "oojs/oojs-ui": "0.12.4", "php": ">=5.3.3", "psr/log": "1.0.0", "wikimedia/cdb": "1.0.1", diff --git a/resources/lib/oojs-ui/i18n/km.json b/resources/lib/oojs-ui/i18n/km.json index c0d72c4f03..0a8bfac24d 100644 --- a/resources/lib/oojs-ui/i18n/km.json +++ b/resources/lib/oojs-ui/i18n/km.json @@ -1,11 +1,20 @@ { "@metadata": { "authors": [ - "Sovichet" + "Sovichet", + "គីមស៊្រុន" ] }, - "ooui-outline-control-move-down": "រុញ​ទៅ​ក្រោម", - "ooui-outline-control-move-up": "រុញ​ទៅ​លើ", - "ooui-outline-control-remove": "ដក​វត្ថុ​ចេញ", - "ooui-toolbar-more": "បន្ថែម" + "ooui-outline-control-move-down": "រុញ​ធាតុទៅ​ក្រោម", + "ooui-outline-control-move-up": "រុញធាតុទៅ​លើ", + "ooui-outline-control-remove": "ដកធាតុចេញ", + "ooui-toolbar-more": "បន្ថែមទៀត", + "ooui-toolgroup-expand": "មើលច្រើន", + "ooui-toolgroup-collapse": "មើលតិច", + "ooui-dialog-message-accept": "យល់ព្រម", + "ooui-dialog-message-reject": "បោះបង់", + "ooui-dialog-process-error": "មានបញ្ហាអ្វីមួយ", + "ooui-dialog-process-dismiss": "បិទ", + "ooui-dialog-process-retry": "ព្យាយាមម្ដងទៀត", + "ooui-dialog-process-continue": "បន្ត" } diff --git a/resources/lib/oojs-ui/oojs-ui-apex-noimages.css b/resources/lib/oojs-ui/oojs-ui-apex-noimages.css index 4c95ebe347..6340e181ae 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex-noimages.css +++ b/resources/lib/oojs-ui/oojs-ui-apex-noimages.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.12.3 + * OOjs UI v0.12.4 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-08-11T22:34:09Z + * Date: 2015-08-13T21:01:12Z */ @-webkit-keyframes oo-ui-progressBarWidget-slide { from { @@ -2283,7 +2283,7 @@ .oo-ui-capsuleMultiSelectWidget-handle { background: #ffffff; cursor: text; - min-height: 2.35em; + min-height: 2.4em; margin-right: 0.5em; padding: 0.25em 0; border: 1px solid rgba(0, 0, 0, 0.1); @@ -2368,9 +2368,10 @@ -moz-box-sizing: border-box; box-sizing: border-box; vertical-align: middle; - padding: 0.2em; + padding: 0 0.4em; margin: 0 0.1em; - height: 1.675em; + height: 1.7em; + line-height: 1.7em; background: #eeeeee; filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#ffffff', endColorstr='#dddddd'); background-image: -webkit-gradient(linear, right top, right bottom, color-stop(0%, #ffffff), color-stop(100%, #dddddd)); @@ -2380,7 +2381,7 @@ background-image: linear-gradient(to bottom, #ffffff 0%, #dddddd 100%); border: 1px solid #cccccc; color: #555555; - border-radius: 0.5em; + border-radius: 0.25em; } .oo-ui-capsuleItemWidget > .oo-ui-iconElement-icon { cursor: pointer; @@ -2398,12 +2399,15 @@ } .oo-ui-capsuleItemWidget.oo-ui-indicatorElement > .oo-ui-indicatorElement-indicator { position: absolute; - right: 0.2em; + right: 0.4em; top: 0; width: 0.9375em; height: 100%; background-repeat: no-repeat; } +.oo-ui-capsuleItemWidget.oo-ui-indicatorElement > .oo-ui-indicator-clear { + cursor: pointer; +} .oo-ui-capsuleItemWidget.oo-ui-widget-disabled { opacity: 0.5; -webkit-transform: translate3d(0, 0, 0); diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index f8be2bb274..8c93afe7f1 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.12.3 + * OOjs UI v0.12.4 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-08-11T22:34:00Z + * Date: 2015-08-13T21:01:04Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css index da5f890a42..b6f8de805e 100644 --- a/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css +++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.12.3 + * OOjs UI v0.12.4 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-08-11T22:34:09Z + * Date: 2015-08-13T21:01:12Z */ @-webkit-keyframes oo-ui-progressBarWidget-slide { from { @@ -2474,7 +2474,7 @@ .oo-ui-capsuleMultiSelectWidget-handle { background: #ffffff; cursor: text; - min-height: 2.35em; + min-height: 2.4em; margin-right: 0.5em; padding: 0.25em 0; border: 1px solid #cccccc; @@ -2559,13 +2559,14 @@ -moz-box-sizing: border-box; box-sizing: border-box; vertical-align: middle; - padding: 0.2em; + padding: 0 0.4em; margin: 0 0.1em; - height: 1.675em; - background-color: #ffffff; + height: 1.7em; + line-height: 1.7em; + background-color: #eeeeee; border: 1px solid #cccccc; color: #555555; - border-radius: 0.2em; + border-radius: 0.1em; } .oo-ui-capsuleItemWidget > .oo-ui-iconElement-icon { cursor: pointer; @@ -2583,7 +2584,7 @@ } .oo-ui-capsuleItemWidget.oo-ui-indicatorElement > .oo-ui-indicatorElement-indicator { position: absolute; - right: 0.2em; + right: 0.4em; top: 0; width: 0.9375em; height: 100%; diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index cb475829d1..ed93566b9d 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.12.3 + * OOjs UI v0.12.4 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-08-11T22:34:00Z + * Date: 2015-08-13T21:01:04Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index dd93fe3ed1..ce067fc717 100644 --- a/resources/lib/oojs-ui/oojs-ui.js +++ b/resources/lib/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.12.3 + * OOjs UI v0.12.4 * https://www.mediawiki.org/wiki/OOjs_UI * * Copyright 2011–2015 OOjs UI Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2015-08-11T22:34:00Z + * Date: 2015-08-13T21:01:04Z */ ( function ( OO ) { @@ -12739,6 +12739,10 @@ OO.ui.CapsuleMultiSelectWidget = function OoUiCapsuleMultiSelectWidget( config ) $tabFocus.on( { focus: this.onFocusForPopup.bind( this ) } ); + this.popup.$element.on( 'focusout', this.onPopupFocusOut.bind( this ) ); + if ( this.popup.$autoCloseIgnore ) { + this.popup.$autoCloseIgnore.on( 'focusout', this.onPopupFocusOut.bind( this ) ); + } this.popup.connect( this, { toggle: function ( visible ) { $tabFocus.toggle( !visible ); @@ -13023,6 +13027,26 @@ OO.ui.CapsuleMultiSelectWidget.prototype.onFocusForPopup = function () { } }; +/** + * Handles popup focus out events. + * + * @private + * @param {Event} e Focus out event + */ +OO.ui.CapsuleMultiSelectWidget.prototype.onPopupFocusOut = function () { + var widget = this.popup; + + setTimeout( function () { + if ( + widget.isVisible() && + !OO.ui.contains( widget.$element[0], document.activeElement, true ) && + ( !widget.$autoCloseIgnore || !widget.$autoCloseIgnore.has( document.activeElement ).length ) + ) { + widget.toggle( false ); + } + } ); +}; + /** * Handle mouse click events. * @@ -16575,10 +16599,6 @@ OO.ui.PopupWidget = function OoUiPopupWidget( config ) { // Events this.closeButton.connect( this, { click: 'onCloseButtonClick' } ); - this.$element.on( 'focusout', this.onFocusOut.bind( this ) ); - if ( this.$autoCloseIgnore ) { - this.$autoCloseIgnore.on( 'focusout', this.onFocusOut.bind( this ) ); - } // Initialization this.toggleAnchor( config.anchor === undefined || config.anchor ); @@ -16619,26 +16639,6 @@ OO.mixinClass( OO.ui.PopupWidget, OO.ui.mixin.ClippableElement ); /* Methods */ -/** - * Handles focus out events. - * - * @private - * @param {Event} e Focus out event - */ -OO.ui.PopupWidget.prototype.onFocusOut = function () { - var widget = this; - - setTimeout( function () { - if ( - widget.isVisible() && - !OO.ui.contains( widget.$element, document.activeElement, true ) && - ( !widget.$autoCloseIgnore || !widget.$autoCloseIgnore.has( document.activeElement ).length ) - ) { - widget.toggle( false ); - } - } ); -}; - /** * Handles mouse down events. * @@ -18160,7 +18160,7 @@ OO.ui.MenuSelectWidget = function OoUiMenuSelectWidget( config ) { this.$input = config.$input ? config.$input : config.input ? config.input.$input : null; this.$widget = config.widget ? config.widget.$element : null; this.onDocumentMouseDownHandler = this.onDocumentMouseDown.bind( this ); - this.onInputKeyPressHandler = OO.ui.debounce( this.updateItemVisibility.bind( this ), 100 ); + this.onInputEditHandler = OO.ui.debounce( this.updateItemVisibility.bind( this ), 100 ); // Initialization this.$element @@ -18231,7 +18231,7 @@ OO.ui.MenuSelectWidget.prototype.onKeyDown = function ( e ) { }; /** - * Update menu item visibility after input key press + * Update menu item visibility after input changes. * @protected */ OO.ui.MenuSelectWidget.prototype.updateItemVisibility = function () { @@ -18279,7 +18279,7 @@ OO.ui.MenuSelectWidget.prototype.unbindKeyDownListener = function () { OO.ui.MenuSelectWidget.prototype.bindKeyPressListener = function () { if ( this.$input ) { if ( this.filterFromInput ) { - this.$input.on( 'keypress', this.onInputKeyPressHandler ); + this.$input.on( 'keydown mouseup cut paste change input select', this.onInputEditHandler ); } } else { OO.ui.MenuSelectWidget.parent.prototype.bindKeyPressListener.call( this ); @@ -18292,7 +18292,7 @@ OO.ui.MenuSelectWidget.prototype.bindKeyPressListener = function () { OO.ui.MenuSelectWidget.prototype.unbindKeyPressListener = function () { if ( this.$input ) { if ( this.filterFromInput ) { - this.$input.off( 'keypress', this.onInputKeyPressHandler ); + this.$input.off( 'keydown mouseup cut paste change input select', this.onInputEditHandler ); this.updateItemVisibility(); } } else {