diff options
| author | Henry Jameson <me@hjkos.com> | 2019-05-13 20:38:54 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2019-05-13 20:38:54 +0300 |
| commit | 750dca4a108bc296afa1586e0d414d3f48bc8032 (patch) | |
| tree | a6c59ae7c3a1b977448bc31fb335dc3c7f63ce79 /src/components/notifications/notifications.js | |
| parent | 1387589ac9dbfe1f8d45073d23d30dca46a9c7bd (diff) | |
| parent | 2322610b62c8593e8ca71a2a8ae7057d4c39b480 (diff) | |
Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass
* upstream/develop: (116 commits)
Fix small mistake in Polish translation
link interaction avatars to the user profile
Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice.
use backendInteractor
refactor api service functions using new helper
clean up
update favorite number earlier
update status interaction upon retweet action response
sync up favoritedBy with favorite/unfavorite action
do not regenerate status object
reduce needless calculation
Move scope visibility notice to the status form, make it dismissible
Revert "eliminate expandable prop in favor of inConversation"
status attention doesn’t have relationship entities
make it short
fix wrong inlineExpanded
expanded is always false, eliminate it
eliminate expandable prop in favor of inConversation
fix conversationId comparision bug using integer format
Display additional scope description above the status form for mobile users.
...
Diffstat (limited to 'src/components/notifications/notifications.js')
| -rw-r--r-- | src/components/notifications/notifications.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js index e341212e..5b13b98e 100644 --- a/src/components/notifications/notifications.js +++ b/src/components/notifications/notifications.js @@ -52,6 +52,10 @@ const Notifications = { this.$store.dispatch('markNotificationsAsSeen') }, fetchOlderNotifications () { + if (this.loading) { + return + } + const store = this.$store const credentials = store.state.users.currentUser.credentials store.commit('setNotificationsLoading', { value: true }) |
