From f8d5dcf9373fd17de9e0c6b1afe2105d9414a5d8 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 22 Sep 2021 15:15:00 +0200 Subject: [PATCH] AddAddress: improve loading transition between step0/step1 and step2 --- .../vuejs/Address/components/AddAddress.vue | 16 ++++++++-------- .../public/vuejs/Address/components/DatePane.vue | 2 +- .../public/vuejs/Address/components/EditPane.vue | 2 +- .../vuejs/Address/components/SuggestPane.vue | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue index ad11fc02f..d3fe43f87 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue @@ -380,15 +380,8 @@ export default { console.log('displaySuggestions'); this.openSuggestPane(); } else { - if (this.flag.suggestPane === true) { - this.closeSuggestPane(); - } - if (this.flag.showPane === true) { - this.closeShowPane(); - } - console.log('step2: open the Edit panel'); this.initForm(); - this.getCountries(); // will open edit pane when resolve promise + this.getCountries(); // will open editPane when resolve promise } }, closeEditPane() { @@ -463,6 +456,13 @@ export default { fetchCountries().then( countries => new Promise((resolve, reject) => { this.entity.loaded.countries = countries.results; + if (this.flag.suggestPane === true) { + this.closeSuggestPane(); + } + if (this.flag.showPane === true) { + this.closeShowPane(); + } + console.log('step2: open the Edit panel'); this.flag.editPane = true; this.flag.loading = false; resolve() diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue index 7a270eafa..7997fbbfa 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue @@ -1,4 +1,4 @@ -