From d3ba0b46585ee68924b6ce77d2eae936ccdb4d32 Mon Sep 17 00:00:00 2001 From: Ivan Date: Sat, 23 Nov 2019 02:12:01 +0300 Subject: [PATCH] Fix electron session api for service removal Use promises instead of callbacks --- app/view/main/MainController.js | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/app/view/main/MainController.js b/app/view/main/MainController.js index 759cf964..b8a0d34c 100644 --- a/app/view/main/MainController.js +++ b/app/view/main/MainController.js @@ -157,18 +157,19 @@ Ext.define('Hamsket.view.main.MainController', { function clearData(webview, tab, resolve) { webview.getWebContents().clearHistory(); webview.getWebContents().session.flushStorageData(); - webview.getWebContents().session.clearCache(function () { - webview.getWebContents().session.clearStorageData(function () { - webview.getWebContents().session.cookies.flushStore(function() { - // Remove record from localStorage - Ext.getStore('Services').remove(rec); - // Close tab - tab.close(); - if ( Ext.isFunction(resolve) ) resolve(); - // Close waiting message - if ( total === actual ) Ext.Msg.hide(); - }); - }); + webview.getWebContents().session.clearCache() + .then(webview.getWebContents().session.clearStorageData) + .then(webview.getWebContents().session.cookies.flushStore) + .then(function() { + // Remove record from localStorage + Ext.getStore('Services').remove(rec); + // Close tab + tab.close(); + if ( Ext.isFunction(resolve) ) resolve(); + // Close waiting message + if ( total === actual ) { + Ext.Msg.hide(); + } }); } }