From 09c55592a73544cc21e002f229686d17806686ba Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Wed, 19 Nov 2014 15:19:01 -0800 Subject: [PATCH] Update OOjs UI to v0.1.0-pre (7922a50558) New changes: 491d279 Change document order of tools and actions to fix floating 25840d5 Add lang and dir attributes to the accelerator element 8a87ddf build: Update various devDependencies to latest b0de093 Fixed RuboCop Style/AndOr offense 577ed71 Fixed RuboCop Style/AsciiComments offense 565251b Fixed RuboCop Style/EmptyLineBetweenDefs offence 328710e Fixed RuboCop Style/EmptyLines offense f2a1811 Fixed RuboCop Style/NegatedIf offense 51e041a Fixed RuboCop Style/SignalException offense 6b3bc5c Fixed RuboCop Style/SpaceAroundEqualsInParameterDefault offense 9224811 Fixed RuboCop Style/NilComparison offense 6ff2b19 Fixed RuboCop Style/SpaceAfterComma offense 22c86e2 Fixed RuboCop Style/TrailingBlankLines offense 33fc646 Consistently use @return annotation 709546c Localisation updates from https://translatewiki.net. 6e6dfae build: Clean up fileExists config Change-Id: I528111c92b89e0302d679ed817a98671035cd8aa --- resources/lib/oojs-ui/i18n/id.json | 11 +++++++++- resources/lib/oojs-ui/i18n/nb.json | 5 ++++- resources/lib/oojs-ui/oojs-ui-apex.css | 4 ++-- resources/lib/oojs-ui/oojs-ui-apex.js | 4 ++-- resources/lib/oojs-ui/oojs-ui-apex.svg.css | 4 ++-- resources/lib/oojs-ui/oojs-ui-mediawiki.css | 4 ++-- resources/lib/oojs-ui/oojs-ui-mediawiki.js | 4 ++-- .../lib/oojs-ui/oojs-ui-mediawiki.svg.css | 4 ++-- resources/lib/oojs-ui/oojs-ui.js | 21 ++++++++++++------- 9 files changed, 39 insertions(+), 22 deletions(-) diff --git a/resources/lib/oojs-ui/i18n/id.json b/resources/lib/oojs-ui/i18n/id.json index 7565f4fc9d..bd65e71a42 100644 --- a/resources/lib/oojs-ui/i18n/id.json +++ b/resources/lib/oojs-ui/i18n/id.json @@ -13,5 +13,14 @@ }, "ooui-outline-control-move-down": "Pindahkan butir ke bawah", "ooui-outline-control-move-up": "Pindahkan butir ke atas", - "ooui-toolbar-more": "Lainnya" + "ooui-outline-control-remove": "Hapus butir", + "ooui-toolbar-more": "Lainnya", + "ooui-toolgroup-expand": "Selengkapnya", + "ooui-toolgroup-collapse": "Secukupnya", + "ooui-dialog-message-accept": "Oke", + "ooui-dialog-message-reject": "Batal", + "ooui-dialog-process-error": "Ada yang tidak beres", + "ooui-dialog-process-dismiss": "Tutup", + "ooui-dialog-process-retry": "Coba lagi", + "ooui-dialog-process-continue": "Lanjutkan" } diff --git a/resources/lib/oojs-ui/i18n/nb.json b/resources/lib/oojs-ui/i18n/nb.json index 3fe75e3f4d..c5ecbac155 100644 --- a/resources/lib/oojs-ui/i18n/nb.json +++ b/resources/lib/oojs-ui/i18n/nb.json @@ -13,9 +13,12 @@ "ooui-outline-control-move-up": "Flytt opp", "ooui-outline-control-remove": "Fjern element", "ooui-toolbar-more": "Mer", + "ooui-toolgroup-expand": "Mer", + "ooui-toolgroup-collapse": "Mindre", "ooui-dialog-message-accept": "OK", "ooui-dialog-message-reject": "Avbryt", "ooui-dialog-process-error": "Noe gikk galt", "ooui-dialog-process-dismiss": "Lukk", - "ooui-dialog-process-retry": "Prøv igjen" + "ooui-dialog-process-retry": "Prøv igjen", + "ooui-dialog-process-continue": "Fortsett" } diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css b/resources/lib/oojs-ui/oojs-ui-apex.css index 29834bd491..721cf0bdb9 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 (f1abca8e82) + * OOjs UI v0.1.0-pre (7922a50558) * 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-11-17T23:49:34Z + * Date: 2014-11-19T23:18:57Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js index c0febe2e6d..3475be45bf 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.1.0-pre (f1abca8e82) + * OOjs UI v0.1.0-pre (7922a50558) * 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-11-17T23:49:27Z + * Date: 2014-11-19T23:18:49Z */ /* Instantiation */ diff --git a/resources/lib/oojs-ui/oojs-ui-apex.svg.css b/resources/lib/oojs-ui/oojs-ui-apex.svg.css index fc8c017818..bc3a228384 100644 --- a/resources/lib/oojs-ui/oojs-ui-apex.svg.css +++ b/resources/lib/oojs-ui/oojs-ui-apex.svg.css @@ -1,12 +1,12 @@ /*! - * OOjs UI v0.1.0-pre (f1abca8e82) + * OOjs UI v0.1.0-pre (7922a50558) * 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-11-17T23:49:34Z + * Date: 2014-11-19T23:18:57Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-mediawiki.css index 51480065ec..69c94387a6 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.1.0-pre (f1abca8e82) + * OOjs UI v0.1.0-pre (7922a50558) * 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-11-17T23:49:34Z + * Date: 2014-11-19T23:18:57Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js index 9cec7daee0..188a4d7f65 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.1.0-pre (f1abca8e82) + * OOjs UI v0.1.0-pre (7922a50558) * 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-11-17T23:49:27Z + * Date: 2014-11-19T23:18:49Z */ /** * @class diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css b/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css index c6eef9def9..458c5ac8fd 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.1.0-pre (f1abca8e82) + * OOjs UI v0.1.0-pre (7922a50558) * 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-11-17T23:49:34Z + * Date: 2014-11-19T23:18:57Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index d0d0620297..dae6b0798f 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 (f1abca8e82) + * OOjs UI v0.1.0-pre (7922a50558) * 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-11-17T23:49:27Z + * Date: 2014-11-19T23:18:49Z */ ( function ( OO ) { @@ -102,7 +102,7 @@ OO.ui.getLocalValue = function ( obj, lang, fallback ) { * @param {HTMLElement|HTMLElement[]} containers Container node(s) to search in * @param {HTMLElement} contained Node to find * @param {boolean} [matchContainers] Include the container(s) in the list of nodes to match, otherwise only match descendents - * @returns {boolean} The node is in the list of target nodes + * @return {boolean} The node is in the list of target nodes */ OO.ui.contains = function ( containers, contained, matchContainers ) { var i; @@ -5017,7 +5017,14 @@ OO.ui.Tool = function OoUiTool( toolGroup, config ) { // Initialization this.$titleText.addClass( 'oo-ui-tool-title-text' ); - this.$accel.addClass( 'oo-ui-tool-accel' ); + this.$accel + .addClass( 'oo-ui-tool-accel' ) + .prop( { + // This may need to be changed if the key names are ever localized, + // but for now they are essentially written in English + dir: 'ltr', + lang: 'en' + } ); this.$title .addClass( 'oo-ui-tool-title' ) .append( this.$titleText, this.$accel ); @@ -5277,12 +5284,10 @@ OO.ui.Toolbar = function OoUiToolbar( toolFactory, toolGroupFactory, config ) { // Initialization this.$group.addClass( 'oo-ui-toolbar-tools' ); - this.$bar.addClass( 'oo-ui-toolbar-bar' ).append( this.$group ); if ( config.actions ) { - this.$actions.addClass( 'oo-ui-toolbar-actions' ); - this.$bar.append( this.$actions ); + this.$bar.append( this.$actions.addClass( 'oo-ui-toolbar-actions' ) ); } - this.$bar.append( '
' ); + this.$bar.append( this.$group, '
' ); if ( config.shadow ) { this.$bar.append( '
' ); } -- 2.20.1