From 5bbf9aa07b2142550b73aff20713cbaa430b2433 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Tue, 8 Nov 2016 20:34:28 -0800 Subject: WIP --- ext/bg/js/options-form.js | 17 +++++++++++++---- ext/bg/options.html | 7 ++----- 2 files changed, 15 insertions(+), 9 deletions(-) (limited to 'ext/bg') diff --git a/ext/bg/js/options-form.js b/ext/bg/js/options-form.js index 8bb60808..8e117012 100644 --- a/ext/bg/js/options-form.js +++ b/ext/bg/js/options-form.js @@ -122,8 +122,8 @@ function populateDictionaries(opts) { const dictError = $('#dict-error'); dictError.hide(); - const dictLaggy = $('#dict-laggy'); - dictLaggy.show(); + const dictSpinner = $('#dict-spinner'); + dictSpinner.show(); database().getDictionaries().then(rows => { rows.forEach(row => { @@ -145,7 +145,7 @@ function populateDictionaries(opts) { }).catch(error => { dictError.show().find('span').text(error); }).then(() => { - dictLaggy.hide(); + dictSpinner.hide(); }); } @@ -156,12 +156,17 @@ function onDictionaryDelete() { const dictError = $('#dict-error'); dictError.hide(); + const dictSpinner = $('#dict-spinner'); + dictSpinner.show(); + const dictGroup = dictDelete.closest('.dict-group'); database().deleteDictionary(dictGroup.data('title')).then(() => { dictGroup.slideUp(); }).catch(error => { dictError.show().find('span').text(error); dictDelete.prop('disabled', false); + }).then(() => { + dictSpinner.hide(); }); } @@ -172,6 +177,9 @@ function onDictionaryImport() { const dictError = $('#dict-error'); dictError.hide(); + const dictSpinner = $('#dict-spinner'); + dictSpinner.show(); + const progressbar = $('#dict-import-progress'); progressbar.show(); @@ -185,9 +193,10 @@ function onDictionaryImport() { }).catch(error => { dictError.show().find('span').text(error); }).then(() => { + dictImport.prop('disabled', false); dictUrl.val(''); progressbar.hide(); - dictImport.prop('disabled', false); + dictSpinner.hide(); }); } diff --git a/ext/bg/options.html b/ext/bg/options.html index a3c66ce3..14f72315 100644 --- a/ext/bg/options.html +++ b/ext/bg/options.html @@ -6,7 +6,7 @@