From f478a3602b4ae11713a8c095c9c5837420858481 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Mon, 5 Jan 2015 13:05:44 +0000 Subject: [PATCH] Update OOjs UI to v0.6.1 Release notes: https://git.wikimedia.org/blob/oojs%2Fui.git/v0.6.1/History.md Change-Id: Iafe5770c74b671dc04a92b9dfab6f121e7fe718d --- composer.json | 2 +- resources/lib/oojs-ui/i18n/ar.json | 8 +++-- resources/lib/oojs-ui/i18n/el.json | 5 ++- resources/lib/oojs-ui/i18n/gl.json | 8 +++-- resources/lib/oojs-ui/i18n/lb.json | 3 +- resources/lib/oojs-ui/i18n/nb.json | 5 +-- resources/lib/oojs-ui/oojs-ui-mediawiki.css | 15 +++++---- resources/lib/oojs-ui/oojs-ui-mediawiki.js | 6 ++-- .../lib/oojs-ui/oojs-ui-mediawiki.svg.css | 15 +++++---- resources/lib/oojs-ui/oojs-ui.js | 33 ++++++++++--------- 10 files changed, 58 insertions(+), 42 deletions(-) diff --git a/composer.json b/composer.json index 8aeb7923dc..5901721369 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "psr/log": "1.0.0", "cssjanus/cssjanus": "1.1.1", "wikimedia/cdb": "1.0.1", - "oojs/oojs-ui": "0.6.0" + "oojs/oojs-ui": "0.6.1" }, "require-dev": { "phpunit/phpunit": "*" diff --git a/resources/lib/oojs-ui/i18n/ar.json b/resources/lib/oojs-ui/i18n/ar.json index b01e2cd408..058a14910a 100644 --- a/resources/lib/oojs-ui/i18n/ar.json +++ b/resources/lib/oojs-ui/i18n/ar.json @@ -9,16 +9,20 @@ "OsamaK", "زكريا", "مشعل الحربي", - "ترجمان05" + "ترجمان05", + "Abanima" ] }, "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-retry": "حاول مرة أخرى", + "ooui-dialog-process-continue": "استمر" } diff --git a/resources/lib/oojs-ui/i18n/el.json b/resources/lib/oojs-ui/i18n/el.json index cddd46e6e4..6fb7dbadca 100644 --- a/resources/lib/oojs-ui/i18n/el.json +++ b/resources/lib/oojs-ui/i18n/el.json @@ -15,9 +15,12 @@ "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-retry": "Δοκιμάστε ξανά", + "ooui-dialog-process-continue": "Συνέχεια" } diff --git a/resources/lib/oojs-ui/i18n/gl.json b/resources/lib/oojs-ui/i18n/gl.json index eac992fd58..a4339f4724 100644 --- a/resources/lib/oojs-ui/i18n/gl.json +++ b/resources/lib/oojs-ui/i18n/gl.json @@ -3,16 +3,20 @@ "authors": [ "Alison", "Kscanne", - "Toliño" + "Toliño", + "Elisardojm" ] }, "ooui-outline-control-move-down": "Mover o elemento abaixo", "ooui-outline-control-move-up": "Mover o elemento arriba", "ooui-outline-control-remove": "Eliminar o elemento", "ooui-toolbar-more": "Máis", + "ooui-toolgroup-expand": "Máis", + "ooui-toolgroup-collapse": "Menos", "ooui-dialog-message-accept": "Aceptar", "ooui-dialog-message-reject": "Cancelar", "ooui-dialog-process-error": "Algo foi mal", "ooui-dialog-process-dismiss": "Agochar", - "ooui-dialog-process-retry": "Inténteo de novo" + "ooui-dialog-process-retry": "Inténteo de novo", + "ooui-dialog-process-continue": "Continuar" } diff --git a/resources/lib/oojs-ui/i18n/lb.json b/resources/lib/oojs-ui/i18n/lb.json index 270bae4695..119d1be92f 100644 --- a/resources/lib/oojs-ui/i18n/lb.json +++ b/resources/lib/oojs-ui/i18n/lb.json @@ -20,5 +20,6 @@ "ooui-dialog-message-reject": "Ofbriechen", "ooui-dialog-process-error": "Et ass eppes schif gaang", "ooui-dialog-process-dismiss": "Verwerfen", - "ooui-dialog-process-retry": "Nach eng Kéier probéieren" + "ooui-dialog-process-retry": "Nach eng Kéier probéieren", + "ooui-dialog-process-continue": "Virufueren" } diff --git a/resources/lib/oojs-ui/i18n/nb.json b/resources/lib/oojs-ui/i18n/nb.json index c5ecbac155..9e773924f1 100644 --- a/resources/lib/oojs-ui/i18n/nb.json +++ b/resources/lib/oojs-ui/i18n/nb.json @@ -6,7 +6,8 @@ "Jeblad", "Laaknor", "Njardarlogar", - "Jdforrester" + "Jdforrester", + "Apple farmer" ] }, "ooui-outline-control-move-down": "Flytt ned", @@ -14,7 +15,7 @@ "ooui-outline-control-remove": "Fjern element", "ooui-toolbar-more": "Mer", "ooui-toolgroup-expand": "Mer", - "ooui-toolgroup-collapse": "Mindre", + "ooui-toolgroup-collapse": "Færre", "ooui-dialog-message-accept": "OK", "ooui-dialog-message-reject": "Avbryt", "ooui-dialog-process-error": "Noe gikk galt", diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-mediawiki.css index 24e0df63aa..ee157b25c8 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.6.0 + * OOjs UI v0.6.1 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2014 OOjs Team and other contributors. + * Copyright 2011–2015 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-12-16T21:01:07Z + * Date: 2015-01-05T13:04:47Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; @@ -66,7 +66,7 @@ cursor: pointer; display: inline-block; vertical-align: middle; - font-family: inherit; + font: inherit; -webkit-touch-callout: none; -webkit-user-select: none; -moz-user-select: none; @@ -460,9 +460,10 @@ margin-top: 2em; } .oo-ui-fieldsetLayout > .oo-ui-labelElement-label { - font-size: 1.5em; + font-size: 1.1em; margin-bottom: 0.5em; padding: 0.25em 0; + font-weight: bold; } .oo-ui-fieldsetLayout.oo-ui-iconElement > .oo-ui-labelElement-label { padding-left: 1.75em; @@ -471,8 +472,8 @@ .oo-ui-fieldsetLayout.oo-ui-iconElement > .oo-ui-iconElement-icon { left: 0; top: 0.25em; - width: 2em; - height: 2em; + width: 1.5em; + height: 1.5em; } .oo-ui-gridLayout { position: absolute; diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index f39ec57c73..09b447449c 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.6.0 + * OOjs UI v0.6.1 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2014 OOjs Team and other contributors. + * Copyright 2011–2015 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-12-16T21:00:55Z + * Date: 2015-01-05T13:04:40Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css b/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css index 44096436c1..815ef02dcb 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.6.0 + * OOjs UI v0.6.1 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2014 OOjs Team and other contributors. + * Copyright 2011–2015 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-12-16T21:01:07Z + * Date: 2015-01-05T13:04:47Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; @@ -66,7 +66,7 @@ cursor: pointer; display: inline-block; vertical-align: middle; - font-family: inherit; + font: inherit; -webkit-touch-callout: none; -webkit-user-select: none; -moz-user-select: none; @@ -460,9 +460,10 @@ margin-top: 2em; } .oo-ui-fieldsetLayout > .oo-ui-labelElement-label { - font-size: 1.5em; + font-size: 1.1em; margin-bottom: 0.5em; padding: 0.25em 0; + font-weight: bold; } .oo-ui-fieldsetLayout.oo-ui-iconElement > .oo-ui-labelElement-label { padding-left: 1.75em; @@ -471,8 +472,8 @@ .oo-ui-fieldsetLayout.oo-ui-iconElement > .oo-ui-iconElement-icon { left: 0; top: 0.25em; - width: 2em; - height: 2em; + width: 1.5em; + height: 1.5em; } .oo-ui-gridLayout { position: absolute; diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index 5f758950fa..ef99551bd4 100644 --- a/resources/lib/oojs-ui/oojs-ui.js +++ b/resources/lib/oojs-ui/oojs-ui.js @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.6.0 + * OOjs UI v0.6.1 * https://www.mediawiki.org/wiki/OOjs_UI * - * Copyright 2011–2014 OOjs Team and other contributors. + * Copyright 2011–2015 OOjs Team and other contributors. * Released under the MIT license * http://oojs.mit-license.org * - * Date: 2014-12-16T21:00:55Z + * Date: 2015-01-05T13:04:40Z */ ( function ( OO ) { @@ -171,7 +171,8 @@ OO.ui.contains = function ( containers, contained, matchContainers ) { * @return {string} Translated message with parameters substituted */ OO.ui.msg = function ( key ) { - var message = messages[key], params = Array.prototype.slice.call( arguments, 1 ); + var message = messages[key], + params = Array.prototype.slice.call( arguments, 1 ); if ( typeof message === 'string' ) { // Perform $1 substitution message = message.replace( /\$(\d+)/g, function ( unused, n ) { @@ -947,10 +948,10 @@ OO.ui.Element.static.getBorders = function ( el ) { right = parseFloat( style ? style.borderRightWidth : $el.css( 'borderRightWidth' ) ) || 0; return { - top: Math.round( top ), - left: Math.round( left ), - bottom: Math.round( bottom ), - right: Math.round( right ) + top: top, + left: left, + bottom: bottom, + right: right }; }; @@ -1770,7 +1771,8 @@ OO.ui.Window.prototype.getContentHeight = function () { // Temporarily resize the frame so getBodyHeight() can use scrollHeight measurements. // Disable transitions first, otherwise we'll get values from when the window was animating. this.withoutSizeTransitions( function () { - var oldHeight = frameStyleObj.height, oldPosition = bodyStyleObj.position; + var oldHeight = frameStyleObj.height, + oldPosition = bodyStyleObj.position; frameStyleObj.height = '1px'; // Force body to resize to new width bodyStyleObj.position = 'relative'; @@ -1779,7 +1781,7 @@ OO.ui.Window.prototype.getContentHeight = function () { bodyStyleObj.position = oldPosition; } ); - return Math.round( + return ( // Add buffer for border ( this.$frame.outerHeight() - this.$frame.innerHeight() ) + // Use combined heights of children @@ -3246,7 +3248,6 @@ OO.ui.WindowManager.prototype.destroy = function () { }; /** - * @abstract * @class * * @constructor @@ -4759,7 +4760,7 @@ OO.ui.IndicatorElement.prototype.setIndicatorElement = function ( $indicator ) { .addClass( 'oo-ui-indicatorElement-indicator' ) .toggleClass( 'oo-ui-indicator-' + this.indicator, !!this.indicator ); if ( this.indicatorTitle !== null ) { - this.$indicatorTitle.attr( 'title', this.indicatorTitle ); + this.$indicator.attr( 'title', this.indicatorTitle ); } }; @@ -6439,7 +6440,7 @@ OO.ui.MessageDialog.prototype.getBodyHeight = function () { $scrollable.height(); $scrollable.contents().show(); - bodyHeight = Math.round( this.text.$element.outerHeight( true ) ); + bodyHeight = this.text.$element.outerHeight( true ); $scrollable[0].style.overflow = oldOverflow; return bodyHeight; @@ -11361,8 +11362,8 @@ OO.ui.PopupWidget.prototype.updateDimensions = function ( transition ) { popupOffset = this.width * ( { left: 0, center: -0.5, right: -1 } )[this.align]; // Figure out if this will cause the popup to go beyond the edge of the container - originOffset = Math.round( this.$element.offset().left ); - containerLeft = Math.round( this.$container.offset().left ); + originOffset = this.$element.offset().left; + containerLeft = this.$container.offset().left; containerWidth = this.$container.innerWidth(); containerRight = containerLeft + containerWidth; popupLeft = popupOffset - this.containerPadding; @@ -11436,7 +11437,7 @@ OO.ui.ProgressBarWidget = function OoUiProgressBarWidget( config ) { // Initialization this.setProgress( config.progress !== undefined ? config.progress : false ); - this.$bar.addClass( 'oo-ui-progressBarWidget-bar'); + this.$bar.addClass( 'oo-ui-progressBarWidget-bar' ); this.$element .attr( { role: 'progressbar', -- 2.20.1