graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 02:53:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix #89

Browse source
This commit is contained in:
syuilo 2017-10-25 20:48:45 +09:00
parent 5a9b2a1255
commit a41a05de31
5 changed files with 62 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG.md
View file

@ -2,13 +2,17 @@ ChangeLog (Release Notes)
=========================
主に notable な changes を書いていきます
unreleased
----------
* Fix: 非ログイン状態ですべてのページが致命的な問題を発生させる (#89)
2742 (2017/10/25)
-----------------
* トラブルシューティングを実装するなど
* New: トラブルシューティングを実装するなど
2735 (2017/10/22)
-----------------
* モバイル版からでもクライアントバージョンを確認できるように
* New: モバイル版からでもクライアントバージョンを確認できるように
2732 (2017/10/22)
-----------------

30
src/web/app/desktop/tags/timeline.tag
View file

@ -424,6 +424,7 @@
import compile from '../../common/scripts/text-compiler';
import dateStringify from '../../common/scripts/date-stringify';
this.mixin('i');
this.mixin('api');
this.mixin('stream');
this.mixin('user-preview');
@ -462,24 +463,31 @@
};
this.capture = withHandler => {
this.stream.send({
type: 'capture',
id: this.post.id
});
if (withHandler) this.stream.on('post-updated', this.onStreamPostUpdated);
if (this.SIGNIN) {
this.stream.send({
type: 'capture',
id: this.post.id
});
if (withHandler) this.stream.on('post-updated', this.onStreamPostUpdated);
}
};
this.decapture = withHandler => {
this.stream.send({
type: 'decapture',
id: this.post.id
});
if (withHandler) this.stream.off('post-updated', this.onStreamPostUpdated);
if (this.SIGNIN) {
this.stream.send({
type: 'decapture',
id: this.post.id
});
if (withHandler) this.stream.off('post-updated', this.onStreamPostUpdated);
}
};
this.on('mount', () => {
this.capture(true);
this.stream.on('_connected_', this.onStreamConnected);
if (this.SIGNIN) {
this.stream.on('_connected_', this.onStreamConnected);
}
if (this.p.text) {
const tokens = this.p.ast;

30
src/web/app/desktop/tags/ui.tag
View file

@ -5,7 +5,7 @@
<div class="content">
<yield />
</div>
<mk-stream-indicator/>
<mk-stream-indicator if={ SIGNIN }/>
<style>
:scope
display block
@ -416,22 +416,26 @@
this.page = this.opts.page;
this.on('mount', () => {
this.stream.on('read_all_messaging_messages', this.onReadAllMessagingMessages);
this.stream.on('unread_messaging_message', this.onUnreadMessagingMessage);
if (this.SIGNIN) {
this.stream.on('read_all_messaging_messages', this.onReadAllMessagingMessages);
this.stream.on('unread_messaging_message', this.onUnreadMessagingMessage);
// Fetch count of unread messaging messages
this.api('messaging/unread').then(res => {
if (res.count > 0) {
this.update({
hasUnreadMessagingMessages: true
});
}
});
// Fetch count of unread messaging messages
this.api('messaging/unread').then(res => {
if (res.count > 0) {
this.update({
hasUnreadMessagingMessages: true
});
}
});
}
});
this.on('unmount', () => {
this.stream.off('read_all_messaging_messages', this.onReadAllMessagingMessages);
this.stream.off('unread_messaging_message', this.onUnreadMessagingMessage);
if (this.SIGNIN) {
this.stream.off('read_all_messaging_messages', this.onReadAllMessagingMessages);
this.stream.off('unread_messaging_message', this.onUnreadMessagingMessage);
}
});
this.onReadAllMessagingMessages = () => {

30
src/web/app/mobile/tags/timeline.tag
View file

@ -467,6 +467,7 @@
import getPostSummary from '../../../../common/get-post-summary.ts';
import openPostForm from '../scripts/open-post-form';
this.mixin('i');
this.mixin('api');
this.mixin('stream');
@ -502,24 +503,31 @@
};
this.capture = withHandler => {
this.stream.send({
type: 'capture',
id: this.post.id
});
if (withHandler) this.stream.on('post-updated', this.onStreamPostUpdated);
if (this.SIGNIN) {
this.stream.send({
type: 'capture',
id: this.post.id
});
if (withHandler) this.stream.on('post-updated', this.onStreamPostUpdated);
}
};
this.decapture = withHandler => {
this.stream.send({
type: 'decapture',
id: this.post.id
});
if (withHandler) this.stream.off('post-updated', this.onStreamPostUpdated);
if (this.SIGNIN) {
this.stream.send({
type: 'decapture',
id: this.post.id
});
if (withHandler) this.stream.off('post-updated', this.onStreamPostUpdated);
}
};
this.on('mount', () => {
this.capture(true);
this.stream.on('_connected_', this.onStreamConnected);
if (this.SIGNIN) {
this.stream.on('_connected_', this.onStreamConnected);
}
if (this.p.text) {
const tokens = this.p.ast;

2
src/web/app/mobile/tags/ui.tag
View file

@ -4,7 +4,7 @@
<div class="content">
<yield />
</div>
<mk-stream-indicator/>
<mk-stream-indicator if={ SIGNIN }/>
<style>
:scope
display block