From fa529fb23a0007a3b28aba1d8c9a0d261cea4dd2 Mon Sep 17 00:00:00 2001 From: "James D. Forrester" Date: Mon, 2 Jun 2014 17:52:08 -0700 Subject: [PATCH] Update OOjs UI to v0.1.0-pre (6379e76bf5) New changes: f55ab55 Localisation updates from https://translatewiki.net. 6379e76 Followup 205fa98a, 8dd3460a: move away from isResolved()/isRejected() Change-Id: I54fcf6fed97d95358c606a82a6e444f03f9247ad --- resources/lib/oojs-ui/i18n/ia.json | 9 ++++++++- resources/lib/oojs-ui/oojs-ui.js | 12 ++++++------ resources/lib/oojs-ui/oojs-ui.svg.css | 4 ++-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/resources/lib/oojs-ui/i18n/ia.json b/resources/lib/oojs-ui/i18n/ia.json index de54b4756f..bdd8fdf17f 100644 --- a/resources/lib/oojs-ui/i18n/ia.json +++ b/resources/lib/oojs-ui/i18n/ia.json @@ -4,5 +4,12 @@ "McDutchie" ] }, - "ooui-dialog-action-close": "Clauder" + "ooui-dialog-action-close": "Clauder", + "ooui-outline-control-move-down": "Displaciar elemento in basso", + "ooui-outline-control-move-up": "Displaciar elemento in alto", + "ooui-outline-control-remove": "Remover elemento", + "ooui-toolbar-more": "Plus", + "ooui-dialog-confirm-title": "Confirmation", + "ooui-dialog-confirm-default-prompt": "Es tu secur?", + "ooui-dialog-confirm-default-cancel": "Cancellar" } diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index 6fc0376f62..cf680f58a1 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 (527ad0ee5a) + * OOjs UI v0.1.0-pre (6379e76bf5) * 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 Jun 02 2014 12:15:09 GMT-0700 (PDT) + * Date: Mon Jun 02 2014 17:52:03 GMT-0700 (PDT) */ ( function ( OO ) { @@ -1081,7 +1081,7 @@ OO.ui.Window.prototype.isVisible = function () { * @return {boolean} Window is opening */ OO.ui.Window.prototype.isOpening = function () { - return !!this.opening && !this.opening.isResolved(); + return !!this.opening && this.opening.state() !== 'resolved'; }; /** @@ -1090,7 +1090,7 @@ OO.ui.Window.prototype.isOpening = function () { * @return {boolean} Window is closing */ OO.ui.Window.prototype.isClosing = function () { - return !!this.closing && !this.closing.isResolved(); + return !!this.closing && this.closing.state() !== 'resolved'; }; /** @@ -1099,7 +1099,7 @@ OO.ui.Window.prototype.isClosing = function () { * @return {boolean} Window is opened */ OO.ui.Window.prototype.isOpened = function () { - return !!this.opened && !this.opened.isResolved(); + return !!this.opened && this.opened.state() !== 'resolved'; }; /** @@ -1383,7 +1383,7 @@ OO.ui.Window.prototype.close = function ( data ) { this.emit( 'closing', data ); this.getTeardownProcess( data ).execute().done( OO.ui.bind( function () { // To do something different with #opened, resolve/reject #opened in the teardown process - if ( !this.opened.isResolved() && !this.opened.isRejected() ) { + if ( this.opened.state() === 'pending' ) { this.opened.resolve(); } this.emit( 'close', data ); diff --git a/resources/lib/oojs-ui/oojs-ui.svg.css b/resources/lib/oojs-ui/oojs-ui.svg.css index ef410a3fb1..f50be3021c 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 (527ad0ee5a) + * OOjs UI v0.1.0-pre (6379e76bf5) * 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 Jun 02 2014 12:15:09 GMT-0700 (PDT) + * Date: Mon Jun 02 2014 17:52:03 GMT-0700 (PDT) */ /* Textures */ -- 2.20.1