From d9703eab67feeecde189ab81c39b02d90f53be85 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 22 Feb 2017 03:13:19 +0900
Subject: [PATCH 1/3] Clean up

---
 gulpfile.ts                  |  6 +----
 src/web/app/base.pug         |  4 ++--
 src/web/app/boot.js          |  2 +-
 src/web/app/client/script.js | 46 +++++++++++++++++++-----------------
 src/web/app/init.css         | 24 +++++++++----------
 5 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/gulpfile.ts b/gulpfile.ts
index 30812bead..c32bad544 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -174,11 +174,7 @@ gulp.task('build:client:scripts', () => new Promise(async (ok) => {
 			.pipe(babel({
 				presets: ['es2015']
 			}))
-			.pipe(uglify({
-				mangle: {
-					toplevel: true
-				}
-			}));
+			.pipe(uglify());
 	}
 
 	es.merge(
diff --git a/src/web/app/base.pug b/src/web/app/base.pug
index 805feaee6..e65726fba 100644
--- a/src/web/app/base.pug
+++ b/src/web/app/base.pug
@@ -16,8 +16,8 @@ html(lang='ja', dir='ltr')
 		block head
 
 	body
-		noscript: div: p JavaScriptを有効にしてください
-		div#init: p
+		noscript: p JavaScriptを有効にしてください
+		div#ini: p
 			span .
 			span .
 			span .
diff --git a/src/web/app/boot.js b/src/web/app/boot.js
index 06e457e2b..6399accd3 100644
--- a/src/web/app/boot.js
+++ b/src/web/app/boot.js
@@ -94,7 +94,7 @@ module.exports = callback => {
 
 		mixins(me);
 
-		const init = document.getElementById('init');
+		const init = document.getElementById('ini');
 		init.parentNode.removeChild(init);
 
 		const app = document.createElement('div');
diff --git a/src/web/app/client/script.js b/src/web/app/client/script.js
index 880500eb1..c04919806 100644
--- a/src/web/app/client/script.js
+++ b/src/web/app/client/script.js
@@ -1,26 +1,28 @@
-const head = document.getElementsByTagName('head')[0];
-const ua = navigator.userAgent.toLowerCase();
-const isMobile = /mobile|iphone|ipad|android/.test(ua);
+(() => {
+	const head = document.getElementsByTagName('head')[0];
+	const ua = navigator.userAgent.toLowerCase();
+	const isMobile = /mobile|iphone|ipad|android/.test(ua);
 
-isMobile ? mountMobile() : mountDesktop();
+	isMobile ? mountMobile() : mountDesktop();
 
-function mountDesktop() {
-	const script = document.createElement('script');
-	script.setAttribute('src', '/_/resources/desktop/script.js');
-	script.setAttribute('async', 'true');
-	script.setAttribute('defer', 'true');
-	head.appendChild(script);
-}
+	function mountDesktop() {
+		const script = document.createElement('script');
+		script.setAttribute('src', '/_/resources/desktop/script.js');
+		script.setAttribute('async', 'true');
+		script.setAttribute('defer', 'true');
+		head.appendChild(script);
+	}
 
-function mountMobile() {
-	const meta = document.createElement('meta');
-	meta.setAttribute('name', 'viewport');
-	meta.setAttribute('content', 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no');
-	head.appendChild(meta);
+	function mountMobile() {
+		const meta = document.createElement('meta');
+		meta.setAttribute('name', 'viewport');
+		meta.setAttribute('content', 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no');
+		head.appendChild(meta);
 
-	const script = document.createElement('script');
-	script.setAttribute('src', '/_/resources/mobile/script.js');
-	script.setAttribute('async', 'true');
-	script.setAttribute('defer', 'true');
-	head.appendChild(script);
-}
+		const script = document.createElement('script');
+		script.setAttribute('src', '/_/resources/mobile/script.js');
+		script.setAttribute('async', 'true');
+		script.setAttribute('defer', 'true');
+		head.appendChild(script);
+	}
+})();
diff --git a/src/web/app/init.css b/src/web/app/init.css
index 2a277a9c8..c92f30b44 100644
--- a/src/web/app/init.css
+++ b/src/web/app/init.css
@@ -4,9 +4,9 @@ html {
 	font-family: sans-serif;
 }
 
-body > noscript > div {
+body > noscript {
 	position: fixed;
-	z-index: 32768;
+	z-index: 2;
 	top: 0;
 	left: 0;
 	width: 100%;
@@ -14,16 +14,16 @@ body > noscript > div {
 	text-align: center;
 	background: #fff;
 }
-	body > noscript > div > p {
+	body > noscript > p {
 		display: block;
 		margin: 32px;
 		font-size: 2em;
 		color: #555;
 	}
 
-#init {
+#ini {
 	position: fixed;
-	z-index: 16384;
+	z-index: 1;
 	top: 0;
 	left: 0;
 	width: 100%;
@@ -32,27 +32,27 @@ body > noscript > div {
 	background: #fff;
 	cursor: wait;
 }
-	#init > p {
+	#ini > p {
 		display: block;
 		user-select: none;
 		margin: 32px;
 		font-size: 4em;
 		color: #555;
 	}
-		#init > p > span {
-			animation: init 1.4s infinite ease-in-out both;
+		#ini > p > span {
+			animation: ini 1.4s infinite ease-in-out both;
 		}
-		#init > p > span:nth-child(1) {
+		#ini > p > span:nth-child(1) {
 			animation-delay: 0s;
 		}
-		#init > p > span:nth-child(2) {
+		#ini > p > span:nth-child(2) {
 			animation-delay: 0.16s;
 		}
-		#init > p > span:nth-child(3) {
+		#ini > p > span:nth-child(3) {
 			animation-delay: 0.32s;
 		}
 
-@keyframes init {
+@keyframes ini {
 	0%, 80%, 100% {
 		opacity: 1;
 	}

From c38a7922380ae3fe86da6d28e12d6633bd8e9c5d Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 22 Feb 2017 03:27:27 +0900
Subject: [PATCH 2/3] Fix bug

---
 tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tsconfig.json b/tsconfig.json
index a0a2a4e29..24925687a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,6 +21,6 @@
 		"./src/**/*.ts"
 	],
 	"exclude": [
-		"./src/web/**/*.ts"
+		"./src/web/app/**/*.ts"
 	]
 }

From 15b237875b62454f7520b261e281860ccf572532 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 22 Feb 2017 03:27:38 +0900
Subject: [PATCH 3/3] Clean up

---
 src/web/app/auth/tags/index.tag               | 2 +-
 src/web/app/auth/view.pug                     | 4 ++--
 src/web/app/boot.js                           | 4 ++--
 src/web/app/client/script.js                  | 4 ++--
 src/web/app/common/tags/core-error.tag        | 2 +-
 src/web/app/common/tags/messaging/index.tag   | 2 +-
 src/web/app/common/tags/messaging/message.tag | 2 +-
 src/web/app/desktop/tags/drive/file.tag       | 6 +++---
 src/web/app/desktop/tags/pages/entrance.tag   | 2 +-
 src/web/app/desktop/tags/post-form.tag        | 2 +-
 src/web/app/desktop/tags/ui-header.tag        | 2 +-
 src/web/app/dev/view.pug                      | 4 ++--
 src/web/app/mobile/tags/page/entrance.tag     | 2 +-
 src/web/server.ts                             | 2 +-
 14 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/web/app/auth/tags/index.tag b/src/web/app/auth/tags/index.tag
index f80e9dd1b..218101f3d 100644
--- a/src/web/app/auth/tags/index.tag
+++ b/src/web/app/auth/tags/index.tag
@@ -23,7 +23,7 @@
 		<h1>サインインしてください</h1>
 		<mk-signin></mk-signin>
 	</main>
-	<footer><img src="/_/resources/auth/logo.svg" alt="Misskey"/></footer>
+	<footer><img src="/resources/auth/logo.svg" alt="Misskey"/></footer>
 	<style>
 		:scope
 			display block
diff --git a/src/web/app/auth/view.pug b/src/web/app/auth/view.pug
index a7b9f9263..94ec12a9a 100644
--- a/src/web/app/auth/view.pug
+++ b/src/web/app/auth/view.pug
@@ -2,5 +2,5 @@ extends ../base
 
 block head
 	meta(name='viewport', content='width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no')
-	link(rel='stylesheet', href='/_/resources/auth/style.css')
-	script(src='/_/resources/auth/script.js', async, defer)
+	link(rel='stylesheet', href='/resources/auth/style.css')
+	script(src='/resources/auth/script.js', async, defer)
diff --git a/src/web/app/boot.js b/src/web/app/boot.js
index 6399accd3..5fc752462 100644
--- a/src/web/app/boot.js
+++ b/src/web/app/boot.js
@@ -94,8 +94,8 @@ module.exports = callback => {
 
 		mixins(me);
 
-		const init = document.getElementById('ini');
-		init.parentNode.removeChild(init);
+		const ini = document.getElementById('ini');
+		ini.parentNode.removeChild(ini);
 
 		const app = document.createElement('div');
 		app.setAttribute('id', 'app');
diff --git a/src/web/app/client/script.js b/src/web/app/client/script.js
index c04919806..dcd6bb16f 100644
--- a/src/web/app/client/script.js
+++ b/src/web/app/client/script.js
@@ -7,7 +7,7 @@
 
 	function mountDesktop() {
 		const script = document.createElement('script');
-		script.setAttribute('src', '/_/resources/desktop/script.js');
+		script.setAttribute('src', '/resources/desktop/script.js');
 		script.setAttribute('async', 'true');
 		script.setAttribute('defer', 'true');
 		head.appendChild(script);
@@ -20,7 +20,7 @@
 		head.appendChild(meta);
 
 		const script = document.createElement('script');
-		script.setAttribute('src', '/_/resources/mobile/script.js');
+		script.setAttribute('src', '/resources/mobile/script.js');
 		script.setAttribute('async', 'true');
 		script.setAttribute('defer', 'true');
 		head.appendChild(script);
diff --git a/src/web/app/common/tags/core-error.tag b/src/web/app/common/tags/core-error.tag
index feac70fbe..b903ba3e8 100644
--- a/src/web/app/common/tags/core-error.tag
+++ b/src/web/app/common/tags/core-error.tag
@@ -1,6 +1,6 @@
 <mk-core-error>
 	<!--i: i.fa.fa-times-circle-->
-	<img src="/_/resources/error.jpg" alt=""/>
+	<img src="/resources/error.jpg" alt=""/>
 	<h1>サーバーに接続できません</h1>
 	<p class="text">インターネット回線に問題があるか、サーバーがダウンまたはメンテナンスしている可能性があります。しばらくしてから<a onclick={ retry }>再度お試し</a>ください。</p>
 	<p class="thanks">いつもMisskeyをご利用いただきありがとうございます。</p>
diff --git a/src/web/app/common/tags/messaging/index.tag b/src/web/app/common/tags/messaging/index.tag
index 2dbf76bd9..e52d19a8e 100644
--- a/src/web/app/common/tags/messaging/index.tag
+++ b/src/web/app/common/tags/messaging/index.tag
@@ -191,7 +191,7 @@
 
 					&:not([data-is-me]):not([data-is-read])
 						> div
-							background-image url("/_/resources/unread.svg")
+							background-image url("/resources/unread.svg")
 							background-repeat no-repeat
 							background-position 0 center
 
diff --git a/src/web/app/common/tags/messaging/message.tag b/src/web/app/common/tags/messaging/message.tag
index de763c779..8657d2ffd 100644
--- a/src/web/app/common/tags/messaging/message.tag
+++ b/src/web/app/common/tags/messaging/message.tag
@@ -2,7 +2,7 @@
 	<div class="content-container">
 		<div class="balloon">
 			<p class="read" if={ message.is_me && message.is_read }>既読</p>
-			<button class="delete-button" if={ message.is_me } title="メッセージを削除"><img src="/_/resources/desktop/messaging/delete.png" alt="Delete"/></button>
+			<button class="delete-button" if={ message.is_me } title="メッセージを削除"><img src="/resources/desktop/messaging/delete.png" alt="Delete"/></button>
 			<div class="content" if={ !message.is_deleted }>
 				<div ref="text"></div>
 				<div class="image" if={ message.file }><img src={ message.file.url } alt="image" title={ message.file.name }/></div>
diff --git a/src/web/app/desktop/tags/drive/file.tag b/src/web/app/desktop/tags/drive/file.tag
index d92d4bbaf..a7502c100 100644
--- a/src/web/app/desktop/tags/drive/file.tag
+++ b/src/web/app/desktop/tags/drive/file.tag
@@ -1,11 +1,11 @@
 <mk-drive-browser-file data-is-selected={ (file._selected || false).toString() } data-is-contextmenu-showing={ isContextmenuShowing.toString() } onclick={ onclick } oncontextmenu={ oncontextmenu } draggable="true" ondragstart={ ondragstart } ondragend={ ondragend } title={ title }>
-	<div class="label" if={ I.avatar_id == file.id }><img src="/_/resources/label.svg"/>
+	<div class="label" if={ I.avatar_id == file.id }><img src="/resources/label.svg"/>
 		<p>アバター</p>
 	</div>
-	<div class="label" if={ I.banner_id == file.id }><img src="/_/resources/label.svg"/>
+	<div class="label" if={ I.banner_id == file.id }><img src="/resources/label.svg"/>
 		<p>バナー</p>
 	</div>
-	<div class="label" if={ I.data.wallpaper == file.id }><img src="/_/resources/label.svg"/>
+	<div class="label" if={ I.data.wallpaper == file.id }><img src="/resources/label.svg"/>
 		<p>壁紙</p>
 	</div>
 	<div class="thumbnail"><img src={ file.url + '?thumbnail&size=128' } alt=""/></div>
diff --git a/src/web/app/desktop/tags/pages/entrance.tag b/src/web/app/desktop/tags/pages/entrance.tag
index 82ac8539c..014637933 100644
--- a/src/web/app/desktop/tags/pages/entrance.tag
+++ b/src/web/app/desktop/tags/pages/entrance.tag
@@ -1,5 +1,5 @@
 <mk-entrance>
-	<main><img src="/_/resources/title.svg" alt="Misskey"/>
+	<main><img src="/resources/title.svg" alt="Misskey"/>
 		<mk-entrance-signin if={ mode == 'signin' }></mk-entrance-signin>
 		<mk-entrance-signup if={ mode == 'signup' }></mk-entrance-signup>
 		<div class="introduction" if={ mode == 'introduction' }>
diff --git a/src/web/app/desktop/tags/post-form.tag b/src/web/app/desktop/tags/post-form.tag
index 3b80eee5d..1646494db 100644
--- a/src/web/app/desktop/tags/post-form.tag
+++ b/src/web/app/desktop/tags/post-form.tag
@@ -4,7 +4,7 @@
 		<div class="medias { with: poll }" if={ files.length != 0 }>
 			<ul>
 				<li each={ files }>
-					<div class="img" style="background-image: url({ url + '?thumbnail&size=64' })" title={ name }></div><img class="remove" onclick={ _remove } src="/_/resources/desktop/remove.png" title="添付取り消し" alt=""/>
+					<div class="img" style="background-image: url({ url + '?thumbnail&size=64' })" title={ name }></div><img class="remove" onclick={ _remove } src="/resources/desktop/remove.png" title="添付取り消し" alt=""/>
 				</li>
 				<li class="add" if={ files.length < 4 } title="PCからファイルを添付" onclick={ selectFile }><i class="fa fa-plus"></i></li>
 			</ul>
diff --git a/src/web/app/desktop/tags/ui-header.tag b/src/web/app/desktop/tags/ui-header.tag
index 4ab178930..b522c5180 100644
--- a/src/web/app/desktop/tags/ui-header.tag
+++ b/src/web/app/desktop/tags/ui-header.tag
@@ -44,7 +44,7 @@
 						display block
 						width 100%
 						height 48px
-						background-image url(/_/resources/desktop/header-logo.svg)
+						background-image url(/resources/desktop/header-logo.svg)
 						background-size 64px
 						background-position center
 						background-repeat no-repeat
diff --git a/src/web/app/dev/view.pug b/src/web/app/dev/view.pug
index aea2f2adb..5b426bcbd 100644
--- a/src/web/app/dev/view.pug
+++ b/src/web/app/dev/view.pug
@@ -1,5 +1,5 @@
 extends ../base
 
 block head
-	link(rel='stylesheet', href='/_/resources/dev/style.css')
-	script(src='/_/resources/dev/script.js', async, defer)
+	link(rel='stylesheet', href='/resources/dev/style.css')
+	script(src='/resources/dev/script.js', async, defer)
diff --git a/src/web/app/mobile/tags/page/entrance.tag b/src/web/app/mobile/tags/page/entrance.tag
index 452dff992..42b308e3e 100644
--- a/src/web/app/mobile/tags/page/entrance.tag
+++ b/src/web/app/mobile/tags/page/entrance.tag
@@ -1,5 +1,5 @@
 <mk-entrance>
-	<main><img src="/_/resources/title.svg" alt="Misskey"/>
+	<main><img src="/resources/title.svg" alt="Misskey"/>
 		<mk-entrance-signin if={ mode == 'signin' }></mk-entrance-signin>
 		<mk-entrance-signup if={ mode == 'signup' }></mk-entrance-signup>
 		<div class="introduction" if={ mode == 'introduction' }>
diff --git a/src/web/server.ts b/src/web/server.ts
index df84facab..72f6df598 100644
--- a/src/web/server.ts
+++ b/src/web/server.ts
@@ -40,7 +40,7 @@ app.use((req, res, next) => {
 app.use(favicon(`${__dirname}/resources/favicon.ico`));
 app.get('/manifest.json', (req, res) => res.sendFile(__dirname + '/resources/manifest.json'));
 app.get('/apple-touch-icon.png', (req, res) => res.sendFile(__dirname + '/resources/apple-touch-icon.png'));
-app.use('/_/resources', express.static(`${__dirname}/resources`, {
+app.use('/resources', express.static(`${__dirname}/resources`, {
 	maxAge: ms('7 days')
 }));