mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-23 15:23:08 +02:00
Fix
This commit is contained in:
parent
2a1fab34df
commit
1f3e128ed5
14 changed files with 24 additions and 27 deletions
|
@ -136,8 +136,8 @@
|
||||||
this.connection = new this.MessagingStreamConnection(this.I, this.user.id);
|
this.connection = new this.MessagingStreamConnection(this.I, this.user.id);
|
||||||
|
|
||||||
this.on('mount', () => {
|
this.on('mount', () => {
|
||||||
this.connection.event.on('message' this.onMessage);
|
this.connection.event.on('message', this.onMessage);
|
||||||
this.connection.event.on('read' this.onRead);
|
this.connection.event.on('read', this.onRead);
|
||||||
|
|
||||||
document.addEventListener('visibilitychange', this.onVisibilitychange);
|
document.addEventListener('visibilitychange', this.onVisibilitychange);
|
||||||
|
|
||||||
|
|
|
@ -2,13 +2,12 @@
|
||||||
<style>
|
<style>
|
||||||
:scope
|
:scope
|
||||||
display inline
|
display inline
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
<script>
|
<script>
|
||||||
this.on('mount', () => {
|
this.on('mount', () => {
|
||||||
// https://github.com/riot/riot/issues/2103
|
// https://github.com/riot/riot/issues/2103
|
||||||
//value = this.opts.value
|
//value = this.opts.value
|
||||||
const value = this.opts.riotValue;
|
let value = this.opts.riotValue;
|
||||||
const max = this.opts.max;
|
const max = this.opts.max;
|
||||||
|
|
||||||
if (max != null && value > max) value = max;
|
if (max != null && value > max) value = max;
|
||||||
|
|
|
@ -8,12 +8,10 @@
|
||||||
height 256px
|
height 256px
|
||||||
</style>
|
</style>
|
||||||
<script>
|
<script>
|
||||||
class Vec2 {
|
const Vec2 = function(x, y) {
|
||||||
constructor(x, y) {
|
|
||||||
this.x = x;
|
this.x = x;
|
||||||
this.y = y;
|
this.y = y;
|
||||||
}
|
};
|
||||||
}
|
|
||||||
|
|
||||||
this.on('mount', () => {
|
this.on('mount', () => {
|
||||||
this.draw()
|
this.draw()
|
||||||
|
|
|
@ -144,7 +144,7 @@
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
<script>
|
<script>
|
||||||
this.bytesToSize = require('../../../common/scripts/bytesToSize.js');
|
this.bytesToSize = require('../../../common/scripts/bytes-to-size');
|
||||||
|
|
||||||
this.mixin('i');
|
this.mixin('i');
|
||||||
|
|
||||||
|
@ -203,7 +203,7 @@
|
||||||
type: 'file',
|
type: 'file',
|
||||||
id: this.file.id,
|
id: this.file.id,
|
||||||
file: this.file
|
file: this.file
|
||||||
});
|
}));
|
||||||
this.isDragging = true;
|
this.isDragging = true;
|
||||||
|
|
||||||
// 親ブラウザに対して、ドラッグが開始されたフラグを立てる
|
// 親ブラウザに対して、ドラッグが開始されたフラグを立てる
|
||||||
|
|
|
@ -115,7 +115,7 @@
|
||||||
this.year = ny;
|
this.year = ny;
|
||||||
this.month = nm + 1;
|
this.month = nm + 1;
|
||||||
this.day = nd;
|
this.day = nd;
|
||||||
this.weekDay = ['日', '月', '火', '水' '木', '金', '土'][now.getDay()];
|
this.weekDay = ['日', '月', '火', '水', '木', '金', '土'][now.getDay()];
|
||||||
|
|
||||||
this.dayNumer = now - new Date(ny, nm, nd);
|
this.dayNumer = now - new Date(ny, nm, nd);
|
||||||
this.dayDenom = 1000/*ms*/ * 60/*s*/ * 60/*m*/ * 24/*h*/;
|
this.dayDenom = 1000/*ms*/ * 60/*s*/ * 60/*m*/ * 24/*h*/;
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
</style>
|
</style>
|
||||||
<script>
|
<script>
|
||||||
this.settings = () => {
|
this.settings = () => {
|
||||||
const w = riot.mount(document.body.appendChild(document.createElement('mk-settings-window')[0];
|
const w = riot.mount(document.body.appendChild(document.createElement('mk-settings-window')))[0];
|
||||||
w.switch('notification');
|
w.switch('notification');
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -139,6 +139,7 @@
|
||||||
wait: false
|
wait: false
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
};
|
||||||
|
|
||||||
this.onquote = () => {
|
this.onquote = () => {
|
||||||
this.quote = true;
|
this.quote = true;
|
||||||
|
|
|
@ -8,15 +8,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</article>
|
</article>
|
||||||
<script>
|
|
||||||
this.mixin('date-stringify');
|
|
||||||
this.mixin('user-preview');
|
|
||||||
|
|
||||||
this.post = this.opts.post
|
|
||||||
|
|
||||||
this.title = @date-stringify this.post.created_at
|
|
||||||
|
|
||||||
</script>
|
|
||||||
<style>
|
<style>
|
||||||
:scope
|
:scope
|
||||||
display block
|
display block
|
||||||
|
@ -97,4 +88,11 @@
|
||||||
font-size 80%
|
font-size 80%
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
<script>
|
||||||
|
this.mixin('date-stringify');
|
||||||
|
this.mixin('user-preview');
|
||||||
|
|
||||||
|
this.post = this.opts.post;
|
||||||
|
this.title = this.dateStringify(this.post.created_at);
|
||||||
|
</script>
|
||||||
</mk-timeline-post-sub>
|
</mk-timeline-post-sub>
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
this.mixin('i');
|
this.mixin('i');
|
||||||
|
|
||||||
this.openPostForm = () => {
|
this.openPostForm = () => {
|
||||||
riot.mount(document.body.appendChild(document.createElement('mk-post-form-window');
|
riot.mount(document.body.appendChild(document.createElement('mk-post-form-window')));
|
||||||
};
|
};
|
||||||
|
|
||||||
this.on('mount', () => {
|
this.on('mount', () => {
|
||||||
|
|
|
@ -71,6 +71,7 @@
|
||||||
|
|
||||||
this.fetch(() => this.trigger('loaded'));
|
this.fetch(() => this.trigger('loaded'));
|
||||||
});
|
});
|
||||||
|
});
|
||||||
|
|
||||||
this.on('unmount', () => {
|
this.on('unmount', () => {
|
||||||
document.removeEventListener('keydown', this.onDocumentKeydown);
|
document.removeEventListener('keydown', this.onDocumentKeydown);
|
||||||
|
|
|
@ -122,7 +122,7 @@
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
<script>
|
<script>
|
||||||
this.bytesToSize = require('../../../common/scripts/bytesToSize.js');
|
this.bytesToSize = require('../../../common/scripts/bytes-to-size');
|
||||||
|
|
||||||
this.browser = this.parent;
|
this.browser = this.parent;
|
||||||
this.file = this.opts.file;
|
this.file = this.opts.file;
|
||||||
|
|
|
@ -64,5 +64,6 @@
|
||||||
type: file.type
|
type: file.type
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
</mk-drive-page>
|
</mk-drive-page>
|
||||||
|
|
|
@ -23,6 +23,6 @@
|
||||||
this.refs.list.on('loaded', () => {
|
this.refs.list.on('loaded', () => {
|
||||||
this.trigger('loaded');
|
this.trigger('loaded');
|
||||||
});
|
});
|
||||||
};
|
});
|
||||||
</script>
|
</script>
|
||||||
</mk-user-followers>
|
</mk-user-followers>
|
||||||
|
|
|
@ -31,7 +31,6 @@ module.exports = (config, commit, env) => {
|
||||||
loader: 'riot-tag-loader',
|
loader: 'riot-tag-loader',
|
||||||
query: {
|
query: {
|
||||||
hot: false,
|
hot: false,
|
||||||
type: 'es6',
|
|
||||||
style: 'stylus',
|
style: 'stylus',
|
||||||
expr: false,
|
expr: false,
|
||||||
compact: true,
|
compact: true,
|
||||||
|
|
Loading…
Reference in a new issue