summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-05-21 03:40:18 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-05-21 03:40:18 +0900
commit0d3117e4722e1ced87ad4bdc81a794c03609c3dd (patch)
tree9b7f189fef2edb69933fc7548303b972c49a0ef7 /src
parentRefactoring (diff)
downloadsharkey-0d3117e4722e1ced87ad4bdc81a794c03609c3dd.tar.gz
sharkey-0d3117e4722e1ced87ad4bdc81a794c03609c3dd.tar.bz2
sharkey-0d3117e4722e1ced87ad4bdc81a794c03609c3dd.zip
Fix
Diffstat (limited to 'src')
-rw-r--r--src/client/app/common/scripts/paging.ts2
-rw-r--r--src/client/app/mobile/views/components/notes.vue4
-rw-r--r--src/client/app/mobile/views/components/ui.header.vue1
-rw-r--r--src/client/app/mobile/views/pages/home.timeline.vue2
4 files changed, 7 insertions, 2 deletions
diff --git a/src/client/app/common/scripts/paging.ts b/src/client/app/common/scripts/paging.ts
index 4875ce620f..c13a607e6f 100644
--- a/src/client/app/common/scripts/paging.ts
+++ b/src/client/app/common/scripts/paging.ts
@@ -82,8 +82,10 @@ export default (opts) => ({
}
this.inited = true;
this.fetching = false;
+ if (opts.onInited) opts.onInited(this);
}, e => {
this.fetching = false;
+ if (opts.onInited) opts.onInited(this);
});
},
diff --git a/src/client/app/mobile/views/components/notes.vue b/src/client/app/mobile/views/components/notes.vue
index 2112259564..1a0cd5cc24 100644
--- a/src/client/app/mobile/views/components/notes.vue
+++ b/src/client/app/mobile/views/components/notes.vue
@@ -59,6 +59,10 @@ export default Vue.extend({
if (document.hidden || !self.isScrollTop()) {
self.$store.commit('pushBehindNote', note);
}
+ },
+
+ onInited: (self) => {
+ self.$emit('loaded');
}
}),
],
diff --git a/src/client/app/mobile/views/components/ui.header.vue b/src/client/app/mobile/views/components/ui.header.vue
index b636041d63..f20f64e7ff 100644
--- a/src/client/app/mobile/views/components/ui.header.vue
+++ b/src/client/app/mobile/views/components/ui.header.vue
@@ -1,6 +1,5 @@
<template>
<div class="header" ref="root" :class="{ shadow: $store.state.device.useShadow }">
- <p class="warn" v-if="env != 'production'">{{ $t('@.do-not-use-in-production') }} <a href="/assets/flush.html?force">Flush</a></p>
<div class="main" ref="main">
<div class="backdrop"></div>
<div class="content" ref="mainContainer">
diff --git a/src/client/app/mobile/views/pages/home.timeline.vue b/src/client/app/mobile/views/pages/home.timeline.vue
index 1f0602b236..f115458092 100644
--- a/src/client/app/mobile/views/pages/home.timeline.vue
+++ b/src/client/app/mobile/views/pages/home.timeline.vue
@@ -7,7 +7,7 @@
</div>
</ui-container>
- <mk-notes ref="timeline" :pagination="pagination" @inited="() => $emit('loaded')"/>
+ <mk-notes ref="timeline" :pagination="pagination" @loaded="() => $emit('loaded')"/>
</div>
</template>