From c8c26badc0918b229b96bd97e5fc484b45e4715f Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 12 Jan 2017 06:03:49 +0900
Subject: Fix

---
 src/web/app/common/tags/signup.tag          | 2 +-
 src/web/app/common/tags/special-message.tag | 4 ++--
 src/web/app/common/tags/uploader.tag        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/web/app/common')

diff --git a/src/web/app/common/tags/signup.tag b/src/web/app/common/tags/signup.tag
index 0d245c6c0b..508b37c1b7 100644
--- a/src/web/app/common/tags/signup.tag
+++ b/src/web/app/common/tags/signup.tag
@@ -3,7 +3,7 @@
 		<label class="username">
 			<p class="caption"><i class="fa fa-at"></i>ユーザー名</p>
 			<input ref="username" type="text" pattern="^[a-zA-Z0-9-]{3,20}$" placeholder="a~z、A~Z、0~9、-" autocomplete="off" required="required" onkeyup={ onChangeUsername }/>
-			<p class="profile-page-url-preview" if={ refs.username.value != '' &amp;&amp; username-state != 'invalidFormat' &amp;&amp; username-state != 'minRange' &amp;&amp; username-state != 'maxRange' }>{ CONFIG.url + '/' + refs.username.value }</p>
+			<p class="profile-page-url-preview" if={ refs.username.value != '' && username-state != 'invalidFormat' && username-state != 'minRange' && username-state != 'maxRange' }>{ CONFIG.url + '/' + refs.username.value }</p>
 			<p class="info" if={ usernameState == 'wait' } style="color:#999"><i class="fa fa-fw fa-spinner fa-pulse"></i>確認しています...</p>
 			<p class="info" if={ usernameState == 'ok' } style="color:#3CB7B5"><i class="fa fa-fw fa-check"></i>利用できます</p>
 			<p class="info" if={ usernameState == 'unavailable' } style="color:#FF1161"><i class="fa fa-fw fa-exclamation-triangle"></i>既に利用されています</p>
diff --git a/src/web/app/common/tags/special-message.tag b/src/web/app/common/tags/special-message.tag
index 8a1337406b..7316d91c89 100644
--- a/src/web/app/common/tags/special-message.tag
+++ b/src/web/app/common/tags/special-message.tag
@@ -1,6 +1,6 @@
 <mk-special-message>
-	<p if={ m == 1 &amp;&amp; d == 1 }>Happy New Year! </p>
-	<p if={ m == 12 &amp;&amp; d == 25 }>Merry Christmas!</p>
+	<p if={ m == 1 && d == 1 }>Happy New Year! </p>
+	<p if={ m == 12 && d == 25 }>Merry Christmas!</p>
 	<style type="stylus">
 		:scope
 			display block
diff --git a/src/web/app/common/tags/uploader.tag b/src/web/app/common/tags/uploader.tag
index 7a1797cc19..a3a16624bc 100644
--- a/src/web/app/common/tags/uploader.tag
+++ b/src/web/app/common/tags/uploader.tag
@@ -5,9 +5,9 @@
 			<p class="name"><i class="fa fa-spinner fa-pulse"></i>{ name }</p>
 			<p class="status"><span class="initing" if={ progress == undefined }>待機中
 					<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>
-			<progress if={ progress != undefined &amp;&amp; progress.value != progress.max } value={ progress.value } max={ progress.max }></progress>
+			<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 &amp;&amp; progress.value == progress.max }></div>
+			<div class="progress waiting" if={ progress != undefined && progress.value == progress.max }></div>
 		</li>
 	</ol>
 	<style type="stylus">
-- 
cgit v1.2.3-freya