From 08f105e2d93bf6f2be0d7dc8d6017b41ec6ad3b0 Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Mon, 19 May 2014 14:09:32 -0700 Subject: [PATCH] Update OOjs UI to v0.1.0-pre (0fbf6bd14e) New changes: ab5ebc6 Localisation updates from https://translatewiki.net. 39a1496 Make flags on buttons in confirmation dialog configurable Change-Id: I6c67b919003a33b1617ad36734bde489d79d916c --- resources/lib/oojs-ui/i18n/ckb.json | 8 ++++++-- resources/lib/oojs-ui/i18n/pfl.json | 5 ++++- resources/lib/oojs-ui/i18n/ro.json | 1 + resources/lib/oojs-ui/oojs-ui.js | 22 +++++++++++----------- resources/lib/oojs-ui/oojs-ui.svg.css | 4 ++-- 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/resources/lib/oojs-ui/i18n/ckb.json b/resources/lib/oojs-ui/i18n/ckb.json index 884a4625de..eadae99894 100644 --- a/resources/lib/oojs-ui/i18n/ckb.json +++ b/resources/lib/oojs-ui/i18n/ckb.json @@ -2,8 +2,12 @@ "@metadata": { "authors": [ "Calak", - "Muhammed taha" + "Muhammed taha", + "Serwan" ] }, - "ooui-dialog-action-close": "دایخە" + "ooui-dialog-action-close": "دایخە", + "ooui-dialog-confirm-default-prompt": "ئایا تۆ دڵنیات ؟", + "ooui-dialog-confirm-default-ok": "باشە", + "ooui-dialog-confirm-default-cancel": "پاشگەزبوونەوە" } diff --git a/resources/lib/oojs-ui/i18n/pfl.json b/resources/lib/oojs-ui/i18n/pfl.json index 0ee623e09e..b51f70dcfd 100644 --- a/resources/lib/oojs-ui/i18n/pfl.json +++ b/resources/lib/oojs-ui/i18n/pfl.json @@ -8,5 +8,8 @@ "ooui-outline-control-move-down": "Bweeschs nunna", "ooui-outline-control-move-up": "Bweeschs nuff", "ooui-outline-control-remove": "Leschs", - "ooui-toolbar-more": "Mea" + "ooui-toolbar-more": "Mea", + "ooui-dialog-confirm-default-prompt": "Bischda sischa?", + "ooui-dialog-confirm-default-ok": "OK", + "ooui-dialog-confirm-default-cancel": "Abbresche" } diff --git a/resources/lib/oojs-ui/i18n/ro.json b/resources/lib/oojs-ui/i18n/ro.json index de7cb1a511..4f379e4d6e 100644 --- a/resources/lib/oojs-ui/i18n/ro.json +++ b/resources/lib/oojs-ui/i18n/ro.json @@ -15,5 +15,6 @@ "ooui-toolbar-more": "Mai mult", "ooui-dialog-confirm-title": "Confirmă", "ooui-dialog-confirm-default-prompt": "Ești sigur?", + "ooui-dialog-confirm-default-ok": "OK", "ooui-dialog-confirm-default-cancel": "Renunță" } diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index 85546f96b8..e1f321bb9b 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 (521a9e242b) + * OOjs UI v0.1.0-pre (0fbf6bd14e) * 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: Mon May 19 2014 10:42:43 GMT-0700 (PDT) + * Date: Mon May 19 2014 14:09:28 GMT-0700 (PDT) */ ( function ( OO ) { @@ -1957,14 +1957,10 @@ OO.ui.ConfirmationDialog.prototype.initialize = function () { this.$promptContainer = this.$( '
' ).addClass( 'oo-ui-dialog-confirm-promptContainer' ); - this.cancelButton = new OO.ui.ButtonWidget( { - 'flags': [ 'destructive' ] - } ); + this.cancelButton = new OO.ui.ButtonWidget(); this.cancelButton.connect( this, { 'click': [ 'emit', 'cancel' ] } ); - this.okButton = new OO.ui.ButtonWidget( { - 'flags': [ 'constructive' ] - } ); + this.okButton = new OO.ui.ButtonWidget(); this.okButton.connect( this, { 'click': [ 'emit', 'ok' ] } ); // Make the buttons @@ -1990,6 +1986,8 @@ OO.ui.ConfirmationDialog.prototype.initialize = function () { * @param {jQuery|string} [data.prompt] The text of the dialog. * @param {jQuery|string|Function|null} [data.okLabel] The text used on the OK button * @param {jQuery|string|Function|null} [data.cancelLabel] The text used on the cancel button + * @param {string[]} [data.okFlags] Flags for the OK button + * @param {string[]} [data.cancelFlags] Flags for the cancel button */ OO.ui.ConfirmationDialog.prototype.setup = function ( data ) { // Parent method @@ -1997,7 +1995,9 @@ OO.ui.ConfirmationDialog.prototype.setup = function ( data ) { var prompt = data.prompt || OO.ui.deferMsg( 'ooui-dialog-confirm-default-prompt' ), okLabel = data.okLabel || OO.ui.deferMsg( 'ooui-dialog-confirm-default-ok' ), - cancelLabel = data.cancelLabel || OO.ui.deferMsg( 'ooui-dialog-confirm-default-cancel' ); + cancelLabel = data.cancelLabel || OO.ui.deferMsg( 'ooui-dialog-confirm-default-cancel' ), + okFlags = data.okFlags || [ 'constructive'], + cancelFlags = data.cancelFlags || [ 'destructive' ]; if ( typeof prompt === 'string' ) { this.$promptContainer.text( prompt ); @@ -2005,8 +2005,8 @@ OO.ui.ConfirmationDialog.prototype.setup = function ( data ) { this.$promptContainer.empty().append( prompt ); } - this.okButton.setLabel( okLabel ); - this.cancelButton.setLabel( cancelLabel ); + this.okButton.setLabel( okLabel ).clearFlags().setFlags( okFlags ); + this.cancelButton.setLabel( cancelLabel ).clearFlags().setFlags( cancelFlags ); }; /** * Element with a button. diff --git a/resources/lib/oojs-ui/oojs-ui.svg.css b/resources/lib/oojs-ui/oojs-ui.svg.css index 2f0d8aa056..51823561a9 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 (521a9e242b) + * OOjs UI v0.1.0-pre (0fbf6bd14e) * 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: Mon May 19 2014 10:42:43 GMT-0700 (PDT) + * Date: Mon May 19 2014 14:09:28 GMT-0700 (PDT) */ /* Textures */ -- 2.20.1