diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-04-09 18:05:46 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-04-09 18:05:46 +0000 |
| commit | b3ace226fbb85ef33b52fa27f592068a2c8a6b8d (patch) | |
| tree | 634f1198d1c1d235912a8c1c016d5849cf2fc68c /src | |
| parent | 1e9ddcb0da433b70c4146c49f3fbeba6bd44b660 (diff) | |
| parent | 011f04c196318e25cfff10f3fa41321070511919 (diff) | |
Merge branch 'fix/prevent-repeated-fetching' into 'develop'
#485 Prevent repeated fetching
Closes #485
See merge request pleroma/pleroma-fe!738
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/login_form/login_form.js | 10 | ||||
| -rw-r--r-- | src/components/timeline/timeline.js | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js index fb6dc651..dc917e47 100644 --- a/src/components/login_form/login_form.js +++ b/src/components/login_form/login_form.js @@ -31,15 +31,19 @@ const LoginForm = { username: this.user.username, password: this.user.password } - ).then((result) => { + ).then(async (result) => { if (result.error) { this.authError = result.error this.user.password = '' return } this.$store.commit('setToken', result.access_token) - this.$store.dispatch('loginUser', result.access_token) - this.$router.push({name: 'friends'}) + try { + await this.$store.dispatch('loginUser', result.access_token) + this.$router.push({name: 'friends'}) + } catch (e) { + console.log(e) + } }) }) }, diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 1da7d5cc..19d9a9ac 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -52,7 +52,7 @@ const Timeline = { window.addEventListener('scroll', this.scrollLoad) - if (this.timelineName === 'friends' && !credentials) { return false } + if (store.state.api.fetchers[this.timelineName]) { return false } timelineFetcher.fetchAndUpdate({ store, |