summaryrefslogtreecommitdiff
path: root/src/web
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-03-27 04:39:46 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-03-27 04:39:46 +0900
commit692bd515e345a750caa285830aa4f78e2dce51f6 (patch)
tree3b4d23d2ffbee685ec886770a05d14690ac776d3 /src/web
parentMerge pull request #341 from syuilo/greenkeeper/riot-3.4.0 (diff)
downloadmisskey-692bd515e345a750caa285830aa4f78e2dce51f6.tar.gz
misskey-692bd515e345a750caa285830aa4f78e2dce51f6.tar.bz2
misskey-692bd515e345a750caa285830aa4f78e2dce51f6.zip
Clean up
Diffstat (limited to 'src/web')
-rw-r--r--src/web/app/common/tags/number.tag4
-rw-r--r--src/web/app/desktop/tags/drive/browser.tag5
-rw-r--r--src/web/app/desktop/tags/drive/nav-folder.tag5
-rw-r--r--src/web/app/desktop/tags/home.tag2
-rw-r--r--src/web/app/desktop/tags/post-form.tag6
-rw-r--r--src/web/app/mobile/tags/drive.tag8
6 files changed, 5 insertions, 25 deletions
diff --git a/src/web/app/common/tags/number.tag b/src/web/app/common/tags/number.tag
index 7dcbceba6a..7afb8b3983 100644
--- a/src/web/app/common/tags/number.tag
+++ b/src/web/app/common/tags/number.tag
@@ -5,9 +5,7 @@
</style>
<script>
this.on('mount', () => {
- // https://github.com/riot/riot/issues/2103
- //value = this.opts.value
- let value = this.opts.riotValue;
+ let value = this.opts.value;
const max = this.opts.max;
if (max != null && value > max) value = max;
diff --git a/src/web/app/desktop/tags/drive/browser.tag b/src/web/app/desktop/tags/drive/browser.tag
index 0e5463fcb2..49531a6a50 100644
--- a/src/web/app/desktop/tags/drive/browser.tag
+++ b/src/web/app/desktop/tags/drive/browser.tag
@@ -282,10 +282,7 @@
this.stream.on('drive_folder_created', this.onStreamDriveFolderCreated);
this.stream.on('drive_folder_updated', this.onStreamDriveFolderUpdated);
- // Riotのバグでnullを渡しても""になる
- // https://github.com/riot/riot/issues/2080
- //if (this.opts.folder)
- if (this.opts.folder && this.opts.folder != '') {
+ if (this.opts.folder) {
this.move(this.opts.folder);
} else {
this.fetch();
diff --git a/src/web/app/desktop/tags/drive/nav-folder.tag b/src/web/app/desktop/tags/drive/nav-folder.tag
index e961ac491b..46ac26f908 100644
--- a/src/web/app/desktop/tags/drive/nav-folder.tag
+++ b/src/web/app/desktop/tags/drive/nav-folder.tag
@@ -8,10 +8,7 @@
<script>
this.mixin('api');
- // Riotのバグでnullを渡しても""になる
- // https://github.com/riot/riot/issues/2080
- //this.folder = this.opts.folder
- this.folder = this.opts.folder && this.opts.folder != '' ? this.opts.folder : null;
+ this.folder = this.opts.folder ? this.opts.folder : null;
this.browser = this.parent;
this.hover = false;
diff --git a/src/web/app/desktop/tags/home.tag b/src/web/app/desktop/tags/home.tag
index a913739af6..7d27710d0a 100644
--- a/src/web/app/desktop/tags/home.tag
+++ b/src/web/app/desktop/tags/home.tag
@@ -61,8 +61,6 @@
this.mixin('i');
this.mode = this.opts.mode || 'timeline';
- // https://github.com/riot/riot/issues/2080
- if (this.mode == '') this.mode = 'timeline';
const _home = {
left: [
diff --git a/src/web/app/desktop/tags/post-form.tag b/src/web/app/desktop/tags/post-form.tag
index ca6b5eb9d1..2412bd7412 100644
--- a/src/web/app/desktop/tags/post-form.tag
+++ b/src/web/app/desktop/tags/post-form.tag
@@ -320,14 +320,8 @@
this.inReplyToPost = this.opts.reply;
- // https://github.com/riot/riot/issues/2080
- if (this.inReplyToPost == '') this.inReplyToPost = null;
-
this.repost = this.opts.repost;
- // https://github.com/riot/riot/issues/2080
- if (this.repost == '') this.repost = null;
-
this.placeholder = this.repost
? '%i18n:desktop.tags.mk-post-form.quote-placeholder%'
: this.inReplyToPost
diff --git a/src/web/app/mobile/tags/drive.tag b/src/web/app/mobile/tags/drive.tag
index 264f1c2219..800cb9d7e6 100644
--- a/src/web/app/mobile/tags/drive.tag
+++ b/src/web/app/mobile/tags/drive.tag
@@ -198,13 +198,9 @@
this.stream.on('drive_folder_created', this.onStreamDriveFolderCreated);
this.stream.on('drive_folder_updated', this.onStreamDriveFolderUpdated);
- // Riotのバグでnullを渡しても""になる
- // https://github.com/riot/riot/issues/2080
- //if (this.opts.folder)
- //if (this.opts.file)
- if (this.opts.folder && this.opts.folder != '') {
+ if (this.opts.folder) {
this.cd(this.opts.folder, true);
- } else if (this.opts.file && this.opts.file != '') {
+ } else if (this.opts.file) {
this.cf(this.opts.file, true);
} else {
this.fetch();