diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2017-06-07 15:43:29 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2017-06-07 15:43:29 +0900 |
| commit | 7d07cde40c2ffdb74c648dba1258084e2a5d5f2d (patch) | |
| tree | 44afde98c02307833036167c7c4a25326fbc627a /src/web/app/common | |
| parent | v2011 (diff) | |
| download | sharkey-7d07cde40c2ffdb74c648dba1258084e2a5d5f2d.tar.gz sharkey-7d07cde40c2ffdb74c648dba1258084e2a5d5f2d.tar.bz2 sharkey-7d07cde40c2ffdb74c648dba1258084e2a5d5f2d.zip | |
Refactor
Diffstat (limited to 'src/web/app/common')
| -rw-r--r-- | src/web/app/common/scripts/text-compiler.js | 2 | ||||
| -rw-r--r-- | src/web/app/common/tags/messaging/form.tag | 2 | ||||
| -rw-r--r-- | src/web/app/common/tags/messaging/index.tag | 2 | ||||
| -rw-r--r-- | src/web/app/common/tags/messaging/message.tag | 2 | ||||
| -rw-r--r-- | src/web/app/common/tags/messaging/room.tag | 4 | ||||
| -rw-r--r-- | src/web/app/common/tags/signin-history.tag | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/web/app/common/scripts/text-compiler.js b/src/web/app/common/scripts/text-compiler.js index 0a9b8022df..20ed1877da 100644 --- a/src/web/app/common/scripts/text-compiler.js +++ b/src/web/app/common/scripts/text-compiler.js @@ -22,7 +22,7 @@ export default (tokens, shouldBreak) => { case 'bold': return `<strong>${escape(token.bold)}</strong>`; case 'url': - return `<mk-url href="${escape(token.content)}" target="_blank"></mk-url>`; + return `<mk-url href="${escape(token.content)}" target="_blank"/>`; case 'link': return `<a class="link" href="${escape(token.url)}" target="_blank" title="${escape(token.url)}">${escape(token.title)}</a>`; case 'mention': diff --git a/src/web/app/common/tags/messaging/form.tag b/src/web/app/common/tags/messaging/form.tag index 2c34756377..a839bad7fa 100644 --- a/src/web/app/common/tags/messaging/form.tag +++ b/src/web/app/common/tags/messaging/form.tag @@ -1,7 +1,7 @@ <mk-messaging-form> <textarea ref="text" onkeypress={ onkeypress } onpaste={ onpaste } placeholder="%i18n:common.input-message-here%"></textarea> <div class="files"></div> - <mk-uploader ref="uploader"></mk-uploader> + <mk-uploader ref="uploader"/> <button class="send" onclick={ send } disabled={ sending } title="%i18n:common.send%"> <i class="fa fa-paper-plane" if={ !sending }></i><i class="fa fa-spinner fa-spin" if={ sending }></i> </button> diff --git a/src/web/app/common/tags/messaging/index.tag b/src/web/app/common/tags/messaging/index.tag index b73c543068..731c9da2c7 100644 --- a/src/web/app/common/tags/messaging/index.tag +++ b/src/web/app/common/tags/messaging/index.tag @@ -22,7 +22,7 @@ <header> <span class="name">{ is_me ? recipient.name : user.name }</span> <span class="username">{ '@' + (is_me ? recipient.username : user.username ) }</span> - <mk-time time={ created_at }></mk-time> + <mk-time time={ created_at }/> </header> <div class="body"> <p class="text"><span class="me" if={ is_me }>%i18n:common.tags.mk-messaging.you%:</span>{ text }</p> diff --git a/src/web/app/common/tags/messaging/message.tag b/src/web/app/common/tags/messaging/message.tag index c5f7e377f0..ec8138da04 100644 --- a/src/web/app/common/tags/messaging/message.tag +++ b/src/web/app/common/tags/messaging/message.tag @@ -12,7 +12,7 @@ </div> </div> <footer> - <mk-time time={ message.created_at }></mk-time><i class="fa fa-pencil is-edited" if={ message.is_edited }></i> + <mk-time time={ message.created_at }/><i class="fa fa-pencil is-edited" if={ message.is_edited }></i> </footer> </div> <style> diff --git a/src/web/app/common/tags/messaging/room.tag b/src/web/app/common/tags/messaging/room.tag index 33bd644f82..bd49a4d782 100644 --- a/src/web/app/common/tags/messaging/room.tag +++ b/src/web/app/common/tags/messaging/room.tag @@ -3,14 +3,14 @@ <p class="init" if={ init }><i class="fa fa-spinner fa-spin"></i>%i18n:common.loading%</p> <p class="empty" if={ !init && messages.length == 0 }><i class="fa fa-info-circle"></i>%i18n:common.tags.mk-messaging-room.empty%</p> <virtual each={ message, i in messages }> - <mk-messaging-message message={ message }></mk-messaging-message> + <mk-messaging-message message={ message }/> <p class="date" if={ i != messages.length - 1 && message._date != messages[i + 1]._date }><span>{ messages[i + 1]._datetext }</span></p> </virtual> </div> <footer> <div ref="notifications"></div> <div class="grippie" title="%i18n:common.tags.mk-messaging-room.resize-form%"></div> - <mk-messaging-form user={ user }></mk-messaging-form> + <mk-messaging-form user={ user }/> </footer> <style> :scope diff --git a/src/web/app/common/tags/signin-history.tag b/src/web/app/common/tags/signin-history.tag index 441e6b5bc3..9c96746249 100644 --- a/src/web/app/common/tags/signin-history.tag +++ b/src/web/app/common/tags/signin-history.tag @@ -1,7 +1,7 @@ <mk-signin-history> <div class="records" if={ history.length != 0 }> <div each={ history }> - <mk-time time={ created_at }></mk-time> + <mk-time time={ created_at }/> <header><i class="fa fa-check" if={ success }></i><i class="fa fa-times" if={ !success }></i><span class="ip">{ ip }</span></header> <pre><code>{ JSON.stringify(headers, null, ' ') }</code></pre> </div> |