summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-02-22 01:20:57 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-02-22 01:20:57 +0900
commit1f3e128ed50ccb27096ab75f9e93cbcf8b5cef2e (patch)
treea0ef3c48a174c788c071699e0a48b4e3ba6c4ca5
parentwip (diff)
downloadmisskey-1f3e128ed50ccb27096ab75f9e93cbcf8b5cef2e.tar.gz
misskey-1f3e128ed50ccb27096ab75f9e93cbcf8b5cef2e.tar.bz2
misskey-1f3e128ed50ccb27096ab75f9e93cbcf8b5cef2e.zip
Fix
-rw-r--r--src/web/app/common/tags/messaging/room.tag4
-rw-r--r--src/web/app/common/tags/number.tag3
-rw-r--r--src/web/app/desktop/tags/analog-clock.tag10
-rw-r--r--src/web/app/desktop/tags/drive/file.tag4
-rw-r--r--src/web/app/desktop/tags/home-widgets/calendar.tag2
-rw-r--r--src/web/app/desktop/tags/home-widgets/notifications.tag2
-rw-r--r--src/web/app/desktop/tags/repost-form.tag1
-rw-r--r--src/web/app/desktop/tags/timeline-post-sub.tag16
-rw-r--r--src/web/app/desktop/tags/ui.tag2
-rw-r--r--src/web/app/desktop/tags/user-timeline.tag1
-rw-r--r--src/web/app/mobile/tags/drive/file.tag2
-rw-r--r--src/web/app/mobile/tags/page/drive.tag1
-rw-r--r--src/web/app/mobile/tags/user-followers.tag2
-rw-r--r--webpack.config.ts1
14 files changed, 24 insertions, 27 deletions
diff --git a/src/web/app/common/tags/messaging/room.tag b/src/web/app/common/tags/messaging/room.tag
index cb676badba..c7fed91db3 100644
--- a/src/web/app/common/tags/messaging/room.tag
+++ b/src/web/app/common/tags/messaging/room.tag
@@ -136,8 +136,8 @@
this.connection = new this.MessagingStreamConnection(this.I, this.user.id);
this.on('mount', () => {
- this.connection.event.on('message' this.onMessage);
- this.connection.event.on('read' this.onRead);
+ this.connection.event.on('message', this.onMessage);
+ this.connection.event.on('read', this.onRead);
document.addEventListener('visibilitychange', this.onVisibilitychange);
diff --git a/src/web/app/common/tags/number.tag b/src/web/app/common/tags/number.tag
index 212a80b736..7dcbceba6a 100644
--- a/src/web/app/common/tags/number.tag
+++ b/src/web/app/common/tags/number.tag
@@ -2,13 +2,12 @@
<style>
:scope
display inline
-
</style>
<script>
this.on('mount', () => {
// https://github.com/riot/riot/issues/2103
//value = this.opts.value
- const value = this.opts.riotValue;
+ let value = this.opts.riotValue;
const max = this.opts.max;
if (max != null && value > max) value = max;
diff --git a/src/web/app/desktop/tags/analog-clock.tag b/src/web/app/desktop/tags/analog-clock.tag
index 4ac6d2281c..c7f2007467 100644
--- a/src/web/app/desktop/tags/analog-clock.tag
+++ b/src/web/app/desktop/tags/analog-clock.tag
@@ -8,12 +8,10 @@
height 256px
</style>
<script>
- class Vec2 {
- constructor(x, y) {
- this.x = x;
- this.y = y;
- }
- }
+ const Vec2 = function(x, y) {
+ this.x = x;
+ this.y = y;
+ };
this.on('mount', () => {
this.draw()
diff --git a/src/web/app/desktop/tags/drive/file.tag b/src/web/app/desktop/tags/drive/file.tag
index 5d12f24191..d92d4bbaf1 100644
--- a/src/web/app/desktop/tags/drive/file.tag
+++ b/src/web/app/desktop/tags/drive/file.tag
@@ -144,7 +144,7 @@
</style>
<script>
- this.bytesToSize = require('../../../common/scripts/bytesToSize.js');
+ this.bytesToSize = require('../../../common/scripts/bytes-to-size');
this.mixin('i');
@@ -203,7 +203,7 @@
type: 'file',
id: this.file.id,
file: this.file
- });
+ }));
this.isDragging = true;
// 親ブラウザに対して、ドラッグが開始されたフラグを立てる
diff --git a/src/web/app/desktop/tags/home-widgets/calendar.tag b/src/web/app/desktop/tags/home-widgets/calendar.tag
index 2a455edff9..9aa4ac6326 100644
--- a/src/web/app/desktop/tags/home-widgets/calendar.tag
+++ b/src/web/app/desktop/tags/home-widgets/calendar.tag
@@ -115,7 +115,7 @@
this.year = ny;
this.month = nm + 1;
this.day = nd;
- this.weekDay = ['日', '月', '火', '水' '木', '金', '土'][now.getDay()];
+ this.weekDay = ['日', '月', '火', '水', '木', '金', '土'][now.getDay()];
this.dayNumer = now - new Date(ny, nm, nd);
this.dayDenom = 1000/*ms*/ * 60/*s*/ * 60/*m*/ * 24/*h*/;
diff --git a/src/web/app/desktop/tags/home-widgets/notifications.tag b/src/web/app/desktop/tags/home-widgets/notifications.tag
index 5ed26b5d74..5d71407b45 100644
--- a/src/web/app/desktop/tags/home-widgets/notifications.tag
+++ b/src/web/app/desktop/tags/home-widgets/notifications.tag
@@ -44,7 +44,7 @@
</style>
<script>
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');
};
</script>
diff --git a/src/web/app/desktop/tags/repost-form.tag b/src/web/app/desktop/tags/repost-form.tag
index de10a37f0e..e5101d9f2c 100644
--- a/src/web/app/desktop/tags/repost-form.tag
+++ b/src/web/app/desktop/tags/repost-form.tag
@@ -139,6 +139,7 @@
wait: false
});
});
+ };
this.onquote = () => {
this.quote = true;
diff --git a/src/web/app/desktop/tags/timeline-post-sub.tag b/src/web/app/desktop/tags/timeline-post-sub.tag
index 2c76527f1a..905bc7aacf 100644
--- a/src/web/app/desktop/tags/timeline-post-sub.tag
+++ b/src/web/app/desktop/tags/timeline-post-sub.tag
@@ -8,15 +8,6 @@
</div>
</div>
</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>
:scope
display block
@@ -97,4 +88,11 @@
font-size 80%
</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>
diff --git a/src/web/app/desktop/tags/ui.tag b/src/web/app/desktop/tags/ui.tag
index 832299e323..0669d252af 100644
--- a/src/web/app/desktop/tags/ui.tag
+++ b/src/web/app/desktop/tags/ui.tag
@@ -14,7 +14,7 @@
this.mixin('i');
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', () => {
diff --git a/src/web/app/desktop/tags/user-timeline.tag b/src/web/app/desktop/tags/user-timeline.tag
index e8ff3dc054..4851eb0a18 100644
--- a/src/web/app/desktop/tags/user-timeline.tag
+++ b/src/web/app/desktop/tags/user-timeline.tag
@@ -70,6 +70,7 @@
});
this.fetch(() => this.trigger('loaded'));
+ });
});
this.on('unmount', () => {
diff --git a/src/web/app/mobile/tags/drive/file.tag b/src/web/app/mobile/tags/drive/file.tag
index f800fd69e0..4b8216219b 100644
--- a/src/web/app/mobile/tags/drive/file.tag
+++ b/src/web/app/mobile/tags/drive/file.tag
@@ -122,7 +122,7 @@
</style>
<script>
- this.bytesToSize = require('../../../common/scripts/bytesToSize.js');
+ this.bytesToSize = require('../../../common/scripts/bytes-to-size');
this.browser = this.parent;
this.file = this.opts.file;
diff --git a/src/web/app/mobile/tags/page/drive.tag b/src/web/app/mobile/tags/page/drive.tag
index c4cc64261f..a064a05598 100644
--- a/src/web/app/mobile/tags/page/drive.tag
+++ b/src/web/app/mobile/tags/page/drive.tag
@@ -64,5 +64,6 @@
type: file.type
});
});
+ });
</script>
</mk-drive-page>
diff --git a/src/web/app/mobile/tags/user-followers.tag b/src/web/app/mobile/tags/user-followers.tag
index 3a1fc1d4b9..e939da6c6e 100644
--- a/src/web/app/mobile/tags/user-followers.tag
+++ b/src/web/app/mobile/tags/user-followers.tag
@@ -23,6 +23,6 @@
this.refs.list.on('loaded', () => {
this.trigger('loaded');
});
- };
+ });
</script>
</mk-user-followers>
diff --git a/webpack.config.ts b/webpack.config.ts
index 6928536ff2..66d4eb2e13 100644
--- a/webpack.config.ts
+++ b/webpack.config.ts
@@ -31,7 +31,6 @@ module.exports = (config, commit, env) => {
loader: 'riot-tag-loader',
query: {
hot: false,
- type: 'es6',
style: 'stylus',
expr: false,
compact: true,