Use "private" close event for dialog helper race condition
This commit is contained in:
@@ -118,13 +118,18 @@ import '../../assets/css/scrollstyles.scss';
|
||||
//resolve();
|
||||
// if we just called history.back(), then use a timeout to allow the history events to fire first
|
||||
setTimeout(() => {
|
||||
dlg.dispatchEvent(new CustomEvent('close', {
|
||||
bubbles: false,
|
||||
cancelable: false
|
||||
}));
|
||||
|
||||
resolve({
|
||||
element: dlg
|
||||
});
|
||||
}, 1);
|
||||
}
|
||||
|
||||
dlg.addEventListener('close', onDialogClosed);
|
||||
dlg.addEventListener('_close', onDialogClosed);
|
||||
|
||||
const center = !dlg.classList.contains('dialog-fixedSize');
|
||||
if (center) {
|
||||
@@ -239,7 +244,7 @@ import '../../assets/css/scrollstyles.scss';
|
||||
focusManager.popScope(dlg);
|
||||
|
||||
dlg.classList.add('hide');
|
||||
dlg.dispatchEvent(new CustomEvent('close', {
|
||||
dlg.dispatchEvent(new CustomEvent('_close', {
|
||||
bubbles: false,
|
||||
cancelable: false
|
||||
}));
|
||||
|
||||
@@ -1087,9 +1087,7 @@ import template from './metadataEditor.template.html';
|
||||
}
|
||||
|
||||
export default {
|
||||
show: async function (itemId, serverId) {
|
||||
const apiClient = ServerConnections.getApiClient(serverId);
|
||||
await apiClient.getItem(apiClient.getCurrentUserId(), itemId);
|
||||
show: function (itemId, serverId) {
|
||||
return new Promise(resolve => show(itemId, serverId, resolve));
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user