amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Client] 良い感じに

Browse Source
This commit is contained in:
syuilo 2017-03-20 05:43:27 +09:00
parent 0390820f07
commit 95440dffb5
3 changed files with 55 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/web/app/common/tags/reactions-viewer.tag
View File

@ -24,6 +24,10 @@
</style> </style>
<script> <script>
this.reactions = this.opts.post.reaction_counts; this.post = this.opts.post;
this.on('update', () => {
this.reactions = this.post.reaction_counts;
});
</script> </script>
</mk-reactions-viewer> </mk-reactions-viewer>

33
src/web/app/desktop/tags/timeline-post.tag
View File

@ -46,7 +46,7 @@
</div> </div>
</div> </div>
<footer> <footer>
<mk-reactions-viewer post={ p }></mk-reactions-viewer> <mk-reactions-viewer post={ p } ref="reactionsViewer"></mk-reactions-viewer>
<button onclick={ reply } title="返信"><i class="fa fa-reply"></i> <button onclick={ reply } title="返信"><i class="fa fa-reply"></i>
<p class="count" if={ p.replies_count > 0 }>{ p.replies_count }</p> <p class="count" if={ p.replies_count > 0 }>{ p.replies_count }</p>
</button> </button>
@ -336,12 +336,28 @@
this.isDetailOpened = false; this.isDetailOpened = false;
this.post = this.opts.post; this.set = post => {
this.isRepost = this.post.repost && this.post.text == null && this.post.media_ids == null && this.post.poll == null; this.post = post;
this.p = this.isRepost ? this.post.repost : this.post; this.isRepost = this.post.repost && this.post.text == null && this.post.media_ids == null && this.post.poll == null;
this.p.reactions_count = this.p.reaction_counts ? Object.keys(this.p.reaction_counts).map(key => this.p.reaction_counts[key]).reduce((a, b) => a + b) : 0; this.p = this.isRepost ? this.post.repost : this.post;
this.title = dateStringify(this.p.created_at); this.p.reactions_count = this.p.reaction_counts ? Object.keys(this.p.reaction_counts).map(key => this.p.reaction_counts[key]).reduce((a, b) => a + b) : 0;
this.url = `/${this.p.user.username}/${this.p.id}`; this.title = dateStringify(this.p.created_at);
this.url = `/${this.p.user.username}/${this.p.id}`;
};
this.set(this.opts.post);
this.refresh = () => {
this.api('posts/show', {
post_id: this.post.id
}).then(post => {
this.set(post);
this.update();
if (this.refs.reactionsViewer) this.refs.reactionsViewer.update({
post
});
});
};
this.on('mount', () => { this.on('mount', () => {
if (this.p.text) { if (this.p.text) {
@ -379,7 +395,8 @@
this.react = () => { this.react = () => {
riot.mount(document.body.appendChild(document.createElement('mk-reaction-picker')), { riot.mount(document.body.appendChild(document.createElement('mk-reaction-picker')), {
source: this.refs.reactButton, source: this.refs.reactButton,
post: this.p post: this.p,
cb: this.refresh
}); });
}; };

33
src/web/app/mobile/tags/timeline-post.tag
View File

@ -43,7 +43,7 @@
</div> </div>
</div> </div>
<footer> <footer>
<mk-reactions-viewer post={ p }></mk-reactions-viewer> <mk-reactions-viewer post={ p } ref="reactionsViewer"></mk-reactions-viewer>
<button onclick={ reply }><i class="fa fa-reply"></i> <button onclick={ reply }><i class="fa fa-reply"></i>
<p class="count" if={ p.replies_count > 0 }>{ p.replies_count }</p> <p class="count" if={ p.replies_count > 0 }>{ p.replies_count }</p>
</button> </button>
@ -312,12 +312,28 @@
import getPostSummary from '../../common/scripts/get-post-summary'; import getPostSummary from '../../common/scripts/get-post-summary';
import openPostForm from '../scripts/open-post-form'; import openPostForm from '../scripts/open-post-form';
this.post = this.opts.post; this.set = post => {
this.isRepost = this.post.repost != null && this.post.text == null; this.post = post;
this.p = this.isRepost ? this.post.repost : this.post; this.isRepost = this.post.repost != null && this.post.text == null;
this.p.reactions_count = this.p.reaction_counts ? Object.keys(this.p.reaction_counts).map(key => this.p.reaction_counts[key]).reduce((a, b) => a + b) : 0; this.p = this.isRepost ? this.post.repost : this.post;
this.summary = getPostSummary(this.p); this.p.reactions_count = this.p.reaction_counts ? Object.keys(this.p.reaction_counts).map(key => this.p.reaction_counts[key]).reduce((a, b) => a + b) : 0;
this.url = `/${this.p.user.username}/${this.p.id}`; this.summary = getPostSummary(this.p);
this.url = `/${this.p.user.username}/${this.p.id}`;
};
this.set(this.opts.post);
this.refresh = () => {
this.api('posts/show', {
post_id: this.post.id
}).then(post => {
this.set(post);
this.update();
if (this.refs.reactionsViewer) this.refs.reactionsViewer.update({
post
});
});
};
this.on('mount', () => { this.on('mount', () => {
if (this.p.text) { if (this.p.text) {
@ -358,7 +374,8 @@
this.react = () => { this.react = () => {
riot.mount(document.body.appendChild(document.createElement('mk-reaction-picker')), { riot.mount(document.body.appendChild(document.createElement('mk-reaction-picker')), {
source: this.refs.reactButton, source: this.refs.reactButton,
post: this.p post: this.p,
cb: this.refresh
}); });
}; };
</script> </script>