From: James D. Forrester Date: Mon, 2 Jun 2014 19:15:14 +0000 (-0700) Subject: Update OOjs UI to v0.1.0-pre (527ad0ee5a) X-Git-Tag: 1.31.0-rc.0~15500 X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=f784655037558166412af0e7a1fdd82309f57621;p=lhc%2Fweb%2Fwiklou.git Update OOjs UI to v0.1.0-pre (527ad0ee5a) New changes: 50355d0 Localisation updates from https://translatewiki.net. 8dd3460 Resolve the opened promise after teardown 5153f85 Followup 205fa98a: fix incorrect use of .super Change-Id: I81986ef0b5b768753ffb3b25ebe41bf648a796d1 --- diff --git a/resources/lib/oojs-ui/i18n/sl.json b/resources/lib/oojs-ui/i18n/sl.json index f56773fd3f..f0ccce582d 100644 --- a/resources/lib/oojs-ui/i18n/sl.json +++ b/resources/lib/oojs-ui/i18n/sl.json @@ -11,5 +11,9 @@ "ooui-outline-control-move-down": "Prestavi predmet nižje", "ooui-outline-control-move-up": "Prestavi predmet višje", "ooui-outline-control-remove": "Odstrani vnos", - "ooui-toolbar-more": "Več" + "ooui-toolbar-more": "Več", + "ooui-dialog-confirm-title": "Potrdi", + "ooui-dialog-confirm-default-prompt": "Ste prepričani?", + "ooui-dialog-confirm-default-ok": "V redu", + "ooui-dialog-confirm-default-cancel": "Prekliči" } diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js index 7e2692fba6..6fc0376f62 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 (dd888aba5c) + * OOjs UI v0.1.0-pre (527ad0ee5a) * 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: Fri May 30 2014 21:28:55 GMT-0700 (PDT) + * Date: Mon Jun 02 2014 12:15:09 GMT-0700 (PDT) */ ( function ( OO ) { @@ -1376,13 +1376,16 @@ OO.ui.Window.prototype.close = function ( data ) { } // Close the window - this.opened.resolve(); // This.closing needs to exist before we emit the closing event so that handlers can call // window.close() and trigger the safety check above this.closing = $.Deferred(); this.frame.$content.find( ':focus' ).blur(); 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() ) { + this.opened.resolve(); + } this.emit( 'close', data ); this.$element.hide(); this.visible = false; @@ -8585,8 +8588,8 @@ OO.ui.ToggleButtonWidget.prototype.setValue = function ( value ) { this.setActive( value ); } - // Parent method - OO.ui.ToggleButtonWidget.super.prototype.setValue.call( this, value ); + // Parent method (from mixin) + OO.ui.ToggleWidget.prototype.setValue.call( this, value ); return this; }; diff --git a/resources/lib/oojs-ui/oojs-ui.svg.css b/resources/lib/oojs-ui/oojs-ui.svg.css index 6c27f57f5b..ef410a3fb1 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 (dd888aba5c) + * OOjs UI v0.1.0-pre (527ad0ee5a) * 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: Fri May 30 2014 21:28:55 GMT-0700 (PDT) + * Date: Mon Jun 02 2014 12:15:09 GMT-0700 (PDT) */ /* Textures */