summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-06-20 22:28:08 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-06-20 22:28:08 +0900
commit3633d7ada156c9da771f1788ca15296d1d68c94e (patch)
tree435405c2d5e9a83306f5ebca776fbee333ccd711 /src/client
parentMerge pull request #1749 from syuilo/greenkeeper/initial (diff)
downloadsharkey-3633d7ada156c9da771f1788ca15296d1d68c94e.tar.gz
sharkey-3633d7ada156c9da771f1788ca15296d1d68c94e.tar.bz2
sharkey-3633d7ada156c9da771f1788ca15296d1d68c94e.zip
Disable transitions to avoid memory leak
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/desktop/views/components/notes.vue5
-rw-r--r--src/client/app/desktop/views/pages/deck/deck.notes.vue5
-rw-r--r--src/client/app/desktop/views/pages/deck/deck.notifications.vue7
3 files changed, 11 insertions, 6 deletions
diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue
index 69f3739f79..5c595c4ca5 100644
--- a/src/client/app/desktop/views/components/notes.vue
+++ b/src/client/app/desktop/views/components/notes.vue
@@ -9,7 +9,8 @@
<button @click="resolveInitPromise">%i18n:@retry%</button>
</div>
- <transition-group name="mk-notes" class="transition">
+ <!-- トランジションを有効にするとなぜかメモリリークする -->
+ <!--<transition-group name="mk-notes" class="transition">-->
<template v-for="(note, i) in _notes">
<x-note :note="note" :key="note.id" @update:note="onNoteUpdated(i, $event)"/>
<p class="date" :key="note.id + '_date'" v-if="i != notes.length - 1 && note._date != _notes[i + 1]._date">
@@ -17,7 +18,7 @@
<span>%fa:angle-down%{{ _notes[i + 1]._datetext }}</span>
</p>
</template>
- </transition-group>
+ <!--</transition-group>-->
<footer v-if="more">
<button @click="loadMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }">
diff --git a/src/client/app/desktop/views/pages/deck/deck.notes.vue b/src/client/app/desktop/views/pages/deck/deck.notes.vue
index 8862b0e0fc..c135c6cd5a 100644
--- a/src/client/app/desktop/views/pages/deck/deck.notes.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.notes.vue
@@ -7,7 +7,8 @@
<button @click="resolveInitPromise">%i18n:@retry%</button>
</div>
- <transition-group name="mk-notes" class="transition">
+ <!-- トランジションを有効にするとなぜかメモリリークする -->
+ <!--<transition-group name="mk-notes" class="transition">-->
<template v-for="(note, i) in _notes">
<x-note :note="note" :key="note.id" @update:note="onNoteUpdated(i, $event)" :media-view="mediaView"/>
<p class="date" :key="note.id + '_date'" v-if="i != notes.length - 1 && note._date != _notes[i + 1]._date">
@@ -15,7 +16,7 @@
<span>%fa:angle-down%{{ _notes[i + 1]._datetext }}</span>
</p>
</template>
- </transition-group>
+ <!--</transition-group>-->
<footer v-if="more">
<button @click="loadMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }">
diff --git a/src/client/app/desktop/views/pages/deck/deck.notifications.vue b/src/client/app/desktop/views/pages/deck/deck.notifications.vue
index f54ad1a3cd..10c06b0ad2 100644
--- a/src/client/app/desktop/views/pages/deck/deck.notifications.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.notifications.vue
@@ -1,6 +1,8 @@
<template>
<div class="oxynyeqmfvracxnglgulyqfgqxnxmehl">
- <transition-group name="mk-notifications" class="transition notifications">
+ <!-- トランジションを有効にするとなぜかメモリリークする -->
+ <!--<transition-group name="mk-notifications" class="transition notifications">-->
+ <div class="notifications">
<template v-for="(notification, i) in _notifications">
<x-notification class="notification" :notification="notification" :key="notification.id"/>
<p class="date" v-if="i != notifications.length - 1 && notification._date != _notifications[i + 1]._date" :key="notification.id + '-time'">
@@ -8,7 +10,8 @@
<span>%fa:angle-down%{{ _notifications[i + 1]._datetext }}</span>
</p>
</template>
- </transition-group>
+ </div>
+ <!--</transition-group>-->
<button class="more" :class="{ fetching: fetchingMoreNotifications }" v-if="moreNotifications" @click="fetchMoreNotifications" :disabled="fetchingMoreNotifications">
<template v-if="fetchingMoreNotifications">%fa:spinner .pulse .fw%</template>{{ fetchingMoreNotifications ? '%i18n:common.loading%' : '%i18n:@more%' }}
</button>