aboutsummaryrefslogtreecommitdiffstats
path: root/resources/lib/oojs-ui/oojs-ui.js
diff options
context:
space:
mode:
authorJames D. Forrester <jforrester@wikimedia.org>2014-06-02 12:15:14 -0700
committerKrinkle <krinklemail@gmail.com>2014-06-02 23:49:10 +0000
commitf784655037558166412af0e7a1fdd82309f57621 (patch)
tree2caaa1ed90bb74460533aa4e0de6e5ff1d982d74 /resources/lib/oojs-ui/oojs-ui.js
parentf853b14c4680569c9128479c36739d3051596236 (diff)
downloadmediawikicore-f784655037558166412af0e7a1fdd82309f57621.tar.gz
mediawikicore-f784655037558166412af0e7a1fdd82309f57621.zip
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
Diffstat (limited to 'resources/lib/oojs-ui/oojs-ui.js')
-rw-r--r--resources/lib/oojs-ui/oojs-ui.js13
1 files changed, 8 insertions, 5 deletions
diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js
index 7e2692fba699..6fc0376f621b 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;
};