jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356396 )
Change subject: WindowManager: Do not use return value of #closeWindow as
promise
......................................................................
WindowManager: Do not use return value of #closeWindow as promise
That is now deprecated. Follow-up to e89731ce588bc0dce320bbc3a3f2417caad4b884.
Also update a demo example that relied on this.
Bug: T166631
Change-Id: I7f6e48caccb9553724e2c28fc1b12f07d9df2937
---
M demos/classes/BrokenDialog.js
M src/WindowManager.js
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/demos/classes/BrokenDialog.js b/demos/classes/BrokenDialog.js
index adbd4d7..62410dd 100644
--- a/demos/classes/BrokenDialog.js
+++ b/demos/classes/BrokenDialog.js
@@ -38,7 +38,7 @@
return 1000;
}, this )
.next( function () {
- var closing;
+ var state;
if ( action === 'save' ) {
if ( this.broken ) {
@@ -49,10 +49,10 @@
return new OO.ui.Error( 'Permission denied', {
recoverable: false } );
}
- closing = this.close( { action: action } );
+ state = this.close( { action: action } );
if ( action === 'save' ) {
// Return a promise to remaing pending while
closing
- return closing;
+ return state.closed;
}
return
Demo.BrokenDialog.parent.prototype.getActionProcess.call( this, action );
}, this );
diff --git a/src/WindowManager.js b/src/WindowManager.js
index 0dde041..961d269 100644
--- a/src/WindowManager.js
+++ b/src/WindowManager.js
@@ -642,7 +642,7 @@
throw new Error( 'Cannot remove window' );
}
cleanupWindow = cleanup.bind( null, name, win );
- promises.push( this.closeWindow( name ).then( cleanupWindow,
cleanupWindow ) );
+ promises.push( this.closeWindow( name ).closed.then(
cleanupWindow, cleanupWindow ) );
}
return $.when.apply( $, promises );
--
To view, visit https://gerrit.wikimedia.org/r/356396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f6e48caccb9553724e2c28fc1b12f07d9df2937
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
