diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2017-06-07 01:33:39 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2017-06-07 01:33:39 +0900 |
| commit | cb543daf28617321f6623706fc69214f5b121e4f (patch) | |
| tree | 0e7cec6861ab38dda806e574f02683f8b1ec49d1 /src/web/app/common | |
| parent | WIP #161 (diff) | |
| download | misskey-cb543daf28617321f6623706fc69214f5b121e4f.tar.gz misskey-cb543daf28617321f6623706fc69214f5b121e4f.tar.bz2 misskey-cb543daf28617321f6623706fc69214f5b121e4f.zip | |
Fix bug
Diffstat (limited to 'src/web/app/common')
| -rw-r--r-- | src/web/app/common/tags/stream-indicator.tag | 4 | ||||
| -rw-r--r-- | src/web/app/common/tags/uploader.tag | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/web/app/common/tags/stream-indicator.tag b/src/web/app/common/tags/stream-indicator.tag index badc64d3cf..ea1c437035 100644 --- a/src/web/app/common/tags/stream-indicator.tag +++ b/src/web/app/common/tags/stream-indicator.tag @@ -1,11 +1,11 @@ <mk-stream-indicator> <p if={ stream.state == 'initializing' }> <i class="fa fa-spinner fa-spin"></i> - <span>%i18n:common.tags.mk-stream-indicator.connecting%<mk-ellipsis></mk-ellipsis></span> + <span>%i18n:common.tags.mk-stream-indicator.connecting%<mk-ellipsis/></span> </p> <p if={ stream.state == 'reconnecting' }> <i class="fa fa-spinner fa-spin"></i> - <span>%i18n:common.tags.mk-stream-indicator.reconnecting%<mk-ellipsis></mk-ellipsis></span> + <span>%i18n:common.tags.mk-stream-indicator.reconnecting%<mk-ellipsis/></span> </p> <p if={ stream.state == 'connected' }> <i class="fa fa-check"></i> diff --git a/src/web/app/common/tags/uploader.tag b/src/web/app/common/tags/uploader.tag index bf55967c08..da97957a2c 100644 --- a/src/web/app/common/tags/uploader.tag +++ b/src/web/app/common/tags/uploader.tag @@ -3,8 +3,7 @@ <li each={ uploads }> <div class="img" style="background-image: url({ img })"></div> <p class="name"><i class="fa fa-spinner fa-pulse"></i>{ name }</p> - <p class="status"><span class="initing" if={ progress == undefined }>%i18n:common.tags.mk-uploader.waiting% - <mk-ellipsis></mk-ellipsis></span><span class="kb" if={ progress != undefined }>{ String(Math.floor(progress.value / 1024)).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1,') }<i>KB</i> / { String(Math.floor(progress.max / 1024)).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1,') }<i>KB</i></span><span class="percentage" if={ progress != undefined }>{ Math.floor((progress.value / progress.max) * 100) }</span></p> + <p class="status"><span class="initing" if={ progress == undefined }>%i18n:common.tags.mk-uploader.waiting%<mk-ellipsis/></span><span class="kb" if={ progress != undefined }>{ String(Math.floor(progress.value / 1024)).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1,') }<i>KB</i> / { String(Math.floor(progress.max / 1024)).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1,') }<i>KB</i></span><span class="percentage" if={ progress != undefined }>{ Math.floor((progress.value / progress.max) * 100) }</span></p> <progress if={ progress != undefined && progress.value != progress.max } value={ progress.value } max={ progress.max }></progress> <div class="progress initing" if={ progress == undefined }></div> <div class="progress waiting" if={ progress != undefined && progress.value == progress.max }></div> |