Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/174589
Change subject: Update OOjs UI to v0.1.0-pre (7922a50558) ...................................................................... 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 --- M lib/oojs-ui/i18n/id.json M lib/oojs-ui/i18n/nb.json M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui-apex.svg.css M lib/oojs-ui/oojs-ui-apex.svg.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.css M lib/oojs-ui/oojs-ui-mediawiki.js M lib/oojs-ui/oojs-ui-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.svg.css M lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css M lib/oojs-ui/oojs-ui.js 13 files changed, 47 insertions(+), 30 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/89/174589/1 diff --git a/lib/oojs-ui/i18n/id.json b/lib/oojs-ui/i18n/id.json index 7565f4f..bd65e71 100644 --- a/lib/oojs-ui/i18n/id.json +++ b/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/lib/oojs-ui/i18n/nb.json b/lib/oojs-ui/i18n/nb.json index 3fe75e3..c5ecbac 100644 --- a/lib/oojs-ui/i18n/nb.json +++ b/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/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css index cf9e74e..275d47f 100644 --- a/lib/oojs-ui/oojs-ui-apex.css +++ b/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-17T22:16:54Z + * Date: 2014-11-19T23:17:39Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; diff --git a/lib/oojs-ui/oojs-ui-apex.js b/lib/oojs-ui/oojs-ui-apex.js index 9ffaeb9..ebf886f 100644 --- a/lib/oojs-ui/oojs-ui-apex.js +++ b/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-17T22:16:43Z + * Date: 2014-11-19T23:17:32Z */ /* Instantiation */ diff --git a/lib/oojs-ui/oojs-ui-apex.rtl.css b/lib/oojs-ui/oojs-ui-apex.rtl.css index f22c167..5345df5 100644 --- a/lib/oojs-ui/oojs-ui-apex.rtl.css +++ b/lib/oojs-ui/oojs-ui-apex.rtl.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-17T22:16:54Z + * Date: 2014-11-19T23:17:39Z */ .oo-ui-progressBarWidget-slide-frames from { margin-right: -40%; diff --git a/lib/oojs-ui/oojs-ui-apex.svg.css b/lib/oojs-ui/oojs-ui-apex.svg.css index bfe9725..29cf17c 100644 --- a/lib/oojs-ui/oojs-ui-apex.svg.css +++ b/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-17T22:16:54Z + * Date: 2014-11-19T23:17:39Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; diff --git a/lib/oojs-ui/oojs-ui-apex.svg.rtl.css b/lib/oojs-ui/oojs-ui-apex.svg.rtl.css index a16a256..1418a03 100644 --- a/lib/oojs-ui/oojs-ui-apex.svg.rtl.css +++ b/lib/oojs-ui/oojs-ui-apex.svg.rtl.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-17T22:16:54Z + * Date: 2014-11-19T23:17:39Z */ .oo-ui-progressBarWidget-slide-frames from { margin-right: -40%; diff --git a/lib/oojs-ui/oojs-ui-mediawiki.css b/lib/oojs-ui/oojs-ui-mediawiki.css index 6b1fc3a..2a56dad 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.css +++ b/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-17T22:16:54Z + * Date: 2014-11-19T23:17:39Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; diff --git a/lib/oojs-ui/oojs-ui-mediawiki.js b/lib/oojs-ui/oojs-ui-mediawiki.js index 6ef1a0a..3274421 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.js +++ b/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-17T22:16:43Z + * Date: 2014-11-19T23:17:32Z */ /** * @class diff --git a/lib/oojs-ui/oojs-ui-mediawiki.rtl.css b/lib/oojs-ui/oojs-ui-mediawiki.rtl.css index b297245..543b4f2 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.rtl.css +++ b/lib/oojs-ui/oojs-ui-mediawiki.rtl.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-17T22:16:54Z + * Date: 2014-11-19T23:17:39Z */ .oo-ui-progressBarWidget-slide-frames from { margin-right: -40%; diff --git a/lib/oojs-ui/oojs-ui-mediawiki.svg.css b/lib/oojs-ui/oojs-ui-mediawiki.svg.css index e981735..f7253ab 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.svg.css +++ b/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-17T22:16:54Z + * Date: 2014-11-19T23:17:39Z */ .oo-ui-progressBarWidget-slide-frames from { margin-left: -40%; diff --git a/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css b/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css index 53402f7..f741c03 100644 --- a/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css +++ b/lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.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-17T22:16:54Z + * Date: 2014-11-19T23:17:39Z */ .oo-ui-progressBarWidget-slide-frames from { margin-right: -40%; diff --git a/lib/oojs-ui/oojs-ui.js b/lib/oojs-ui/oojs-ui.js index 50142d4..7f61fdc 100644 --- a/lib/oojs-ui/oojs-ui.js +++ b/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-17T22:16:43Z + * Date: 2014-11-19T23:17:32Z */ ( function ( OO ) { @@ -102,7 +102,7 @@ * @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 @@ // 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 @@ // 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( '<div style="clear:both"></div>' ); + this.$bar.append( this.$group, '<div style="clear:both"></div>' ); if ( config.shadow ) { this.$bar.append( '<div class="oo-ui-toolbar-shadow"></div>' ); } -- To view, visit https://gerrit.wikimedia.org/r/174589 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I528111c92b89e0302d679ed817a98671035cd8aa Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope <roan.katt...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
