summaryrefslogtreecommitdiff
path: root/src/client/app
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-06-22 18:03:08 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-06-22 18:03:08 +0900
commit09c5efc161585f0c7443bb6e1cc737397a149dde (patch)
tree6de011866bbbee0749bb3fd830e752556b4cbe2e /src/client/app
parentClean up: Remove the unused file (diff)
downloadsharkey-09c5efc161585f0c7443bb6e1cc737397a149dde.tar.gz
sharkey-09c5efc161585f0c7443bb6e1cc737397a149dde.tar.bz2
sharkey-09c5efc161585f0c7443bb6e1cc737397a149dde.zip
:v:
Diffstat (limited to 'src/client/app')
-rw-r--r--src/client/app/common/views/widgets/hashtags.vue7
-rw-r--r--src/client/app/desktop/views/components/notifications.vue9
-rw-r--r--src/client/app/mobile/views/components/notes.vue7
-rw-r--r--src/client/app/mobile/views/components/notifications.vue7
4 files changed, 21 insertions, 9 deletions
diff --git a/src/client/app/common/views/widgets/hashtags.vue b/src/client/app/common/views/widgets/hashtags.vue
index 9ab855d927..2065bd407c 100644
--- a/src/client/app/common/views/widgets/hashtags.vue
+++ b/src/client/app/common/views/widgets/hashtags.vue
@@ -6,7 +6,9 @@
<div class="mkw-hashtags--body" :data-mobile="platform == 'mobile'">
<p class="fetching" v-if="fetching">%fa:spinner .pulse .fw%%i18n:common.loading%<mk-ellipsis/></p>
<p class="empty" v-else-if="stats.length == 0">%fa:exclamation-circle%%i18n:@empty%</p>
- <transition-group v-else tag="div" name="chart">
+ <!-- トランジションを有効にするとなぜかメモリリークする -->
+ <!-- <transition-group v-else tag="div" name="chart"> -->
+ <div>
<div v-for="stat in stats" :key="stat.tag">
<div class="tag">
<router-link :to="`/tags/${ stat.tag }`" :title="stat.tag">#{{ stat.tag }}</router-link>
@@ -14,7 +16,8 @@
</div>
<x-chart class="chart" :src="stat.chart"/>
</div>
- </transition-group>
+ </div>
+ <!-- </transition-group> -->
</div>
</mk-widget-container>
</div>
diff --git a/src/client/app/desktop/views/components/notifications.vue b/src/client/app/desktop/views/components/notifications.vue
index e479ffadbf..32b36994db 100644
--- a/src/client/app/desktop/views/components/notifications.vue
+++ b/src/client/app/desktop/views/components/notifications.vue
@@ -1,7 +1,9 @@
<template>
<div class="mk-notifications">
<div class="notifications" v-if="notifications.length != 0">
- <transition-group name="mk-notifications" class="transition">
+ <!-- トランジションを有効にするとなぜかメモリリークする -->
+ <!-- <transition-group name="mk-notifications" class="transition"> -->
+ <div>
<template v-for="(notification, i) in _notifications">
<div class="notification" :class="notification.type" :key="notification.id">
<mk-time :time="notification.createdAt"/>
@@ -95,7 +97,8 @@
<span>%fa:angle-down%{{ _notifications[i + 1]._datetext }}</span>
</p>
</template>
- </transition-group>
+ </div>
+ <!-- </transition-group> -->
</div>
<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%' }}
@@ -201,7 +204,7 @@ root(isDark)
transition transform .3s ease, opacity .3s ease
> .notifications
- > *
+ > div
> .notification
margin 0
padding 16px
diff --git a/src/client/app/mobile/views/components/notes.vue b/src/client/app/mobile/views/components/notes.vue
index 7aaf0424c7..06d22c7258 100644
--- a/src/client/app/mobile/views/components/notes.vue
+++ b/src/client/app/mobile/views/components/notes.vue
@@ -13,7 +13,9 @@
<button @click="resolveInitPromise">%i18n:@retry%</button>
</div>
- <transition-group name="mk-notes" class="transition">
+ <!-- トランジションを有効にするとなぜかメモリリークする -->
+ <!-- <transition-group name="mk-notes" class="transition"> -->
+ <div class="transition">
<template v-for="(note, i) in _notes">
<mk-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">
@@ -21,7 +23,8 @@
<span>%fa:angle-down%{{ _notes[i + 1]._datetext }}</span>
</p>
</template>
- </transition-group>
+ </div>
+ <!-- </transition-group> -->
<footer v-if="more">
<button @click="loadMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }">
diff --git a/src/client/app/mobile/views/components/notifications.vue b/src/client/app/mobile/views/components/notifications.vue
index 6bb9e9bb2c..fc220c252a 100644
--- a/src/client/app/mobile/views/components/notifications.vue
+++ b/src/client/app/mobile/views/components/notifications.vue
@@ -1,6 +1,8 @@
<template>
<div class="mk-notifications">
- <transition-group name="mk-notifications" class="transition notifications">
+ <!-- トランジションを有効にするとなぜかメモリリークする -->
+ <!-- <transition-group name="mk-notifications" class="transition notifications"> -->
+ <div class="transition notifications">
<template v-for="(notification, i) in _notifications">
<mk-notification :notification="notification" :key="notification.id"/>
<p class="date" :key="notification.id + '_date'" v-if="i != notifications.length - 1 && notification._date != _notifications[i + 1]._date">
@@ -8,7 +10,8 @@
<span>%fa:angle-down%{{ _notifications[i + 1]._datetext }}</span>
</p>
</template>
- </transition-group>
+ </div>
+ <!-- </transition-group> -->
<button class="more" v-if="moreNotifications" @click="fetchMoreNotifications" :disabled="fetchingMoreNotifications">
<template v-if="fetchingMoreNotifications">%fa:spinner .pulse .fw%</template>