Merge branch 'develop'

7 files changed, 52 insertions, 40 deletions

diff --git a/src/client/app/common/views/components/games/reversi/reversi.game.vue b/src/client/app/common/views/components/games/reversi/reversi.game.vue
index 315fb464b2..3f481e8eb5 100644
--- a/src/client/app/common/views/components/games/reversi/reversi.game.vue
+++ b/src/client/app/common/views/components/games/reversi/reversi.game.vue
@@ -23,11 +23,11 @@
 	</div>
 
 	<div class="board">
-		<div class="labels-x" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
+		<div class="labels-x" v-if="$store.state.settings.gamesReversiShowBoardLabels">
 			<span v-for="i in game.map[0].length">{{ String.fromCharCode(64 + i) }}</span>
 		</div>
 		<div class="flex">
-			<div class="labels-y" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
+			<div class="labels-y" v-if="$store.state.settings.gamesReversiShowBoardLabels">
 				<div v-for="i in game.map.length">{{ i }}</div>
 			</div>
 			<div class="cells" :style="cellsStyle">
@@ -35,7 +35,7 @@
 						:class="{ empty: stone == null, none: o.map[i] == 'null', isEnded: game.isEnded, myTurn: !game.isEnded && isMyTurn, can: turnUser ? o.canPut(turnUser.id == blackUser.id, i) : null, prev: o.prevPos == i }"
 						@click="set(i)"
 						:title="`${String.fromCharCode(65 + o.transformPosToXy(i)[0])}${o.transformPosToXy(i)[1] + 1}`">
-					<template v-if="$store.state.settings.games.reversi.useAvatarStones">
+					<template v-if="$store.state.settings.gamesReversiUseAvatarStones">
 						<img v-if="stone === true" :src="blackUser.avatarUrl" alt="black">
 						<img v-if="stone === false" :src="whiteUser.avatarUrl" alt="white">
 					</template>
@@ -45,11 +45,11 @@
 					</template>
 				</div>
 			</div>
-			<div class="labels-y" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
+			<div class="labels-y" v-if="this.$store.state.settings.gamesReversiShowBoardLabels">
 				<div v-for="i in game.map.length">{{ i }}</div>
 			</div>
 		</div>
-		<div class="labels-x" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
+		<div class="labels-x" v-if="this.$store.state.settings.gamesReversiShowBoardLabels">
 			<span v-for="i in game.map[0].length">{{ String.fromCharCode(64 + i) }}</span>
 		</div>
 	</div>
diff --git a/src/client/app/common/views/components/settings/settings.vue b/src/client/app/common/views/components/settings/settings.vue
index 4d4cac0976..0cbc40da57 100644
--- a/src/client/app/common/views/components/settings/settings.vue
+++ b/src/client/app/common/views/components/settings/settings.vue
@@ -472,13 +472,13 @@ export default Vue.extend({
 		},
 
 		games_reversi_showBoardLabels: {
-			get() { return this.$store.state.settings.games.reversi.showBoardLabels; },
-			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.showBoardLabels', value }); }
+			get() { return this.$store.state.settings.gamesReversiShowBoardLabels; },
+			set(value) { this.$store.dispatch('settings/set', { key: 'gamesReversiShowBoardLabels', value }); }
 		},
 
 		games_reversi_useAvatarStones: {
-			get() { return this.$store.state.settings.games.reversi.useAvatarStones; },
-			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.useAvatarStones', value }); }
+			get() { return this.$store.state.settings.gamesReversiUseAvatarStones; },
+			set(value) { this.$store.dispatch('settings/set', { key: 'gamesReversiUseAvatarStones', value }); }
 		},
 
 		disableAnimatedMfm: {
diff --git a/src/client/app/common/views/components/signup.vue b/src/client/app/common/views/components/signup.vue
index bf8e5d25b8..421d09a4dd 100644
--- a/src/client/app/common/views/components/signup.vue
+++ b/src/client/app/common/views/components/signup.vue
@@ -43,7 +43,7 @@
 			</i18n>
 		</ui-switch>
 		<div v-if="meta.enableRecaptcha" class="g-recaptcha" :data-sitekey="meta.recaptchaSiteKey" style="margin: 16px 0;"></div>
-		<ui-button type="submit" :disabled="!(meta.ToSUrl ? ToSAgreement : true)">{{ $t('create') }}</ui-button>
+		<ui-button type="submit" :disabled="!(meta.ToSUrl ? ToSAgreement : true) || passwordRetypeState == 'not-match'">{{ $t('create') }}</ui-button>
 	</template>
 </form>
 </template>
diff --git a/src/client/app/common/views/components/url.vue b/src/client/app/common/views/components/url.vue
index 078c816523..b22a10097d 100644
--- a/src/client/app/common/views/components/url.vue
+++ b/src/client/app/common/views/components/url.vue
@@ -21,10 +21,10 @@ export default Vue.extend({
 	props: ['url', 'rel'],
 	data() {
 		const isSelf = this.url.startsWith(local);
-		const hasRoute =
+		const hasRoute = isSelf && (
 			this.url.substr(local.length).startsWith('/@') ||
 			this.url.substr(local.length).startsWith('/notes/') ||
-			this.url.substr(local.length).startsWith('/pages/');
+			this.url.substr(local.length).startsWith('/pages/'));
 		return {
 			local,
 			schema: null,
diff --git a/src/client/app/common/views/pages/page/page.vue b/src/client/app/common/views/pages/page/page.vue
index 7938d706b9..96a2cfafb7 100644
--- a/src/client/app/common/views/pages/page/page.vue
+++ b/src/client/app/common/views/pages/page/page.vue
@@ -1,5 +1,5 @@
 <template>
-<div v-if="page" class="iroscrza" :class="{ shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners, center: page.alignCenter }" :style="{ fontFamily: page.font }">
+<div v-if="page" class="iroscrza" :class="{ shadow: $store.state.device.useShadow, round: $store.state.device.roundedCorners, center: page.alignCenter }" :style="{ fontFamily: page.font }" :key="path">
 	<header>
 		<div class="title">{{ page.title }}</div>
 	</header>
@@ -85,30 +85,46 @@ export default Vue.extend({
 		};
 	},
 
+	computed: {
+		path(): string {
+			return this.username + '/' + this.pageName;
+		}
+	},
+
+	watch: {
+		path() {
+			this.fetch();
+		}
+	},
+
 	created() {
-		this.$root.api('pages/show', {
-			name: this.pageName,
-			username: this.username,
-		}).then(page => {
-			this.page = page;
-			this.$emit('init', {
-				title: this.page.title,
-				icon: faStickyNote
-			});
-			const pageVars = this.getPageVars();
-			this.script = new Script(new ASEvaluator(this.page.variables, pageVars, {
-				randomSeed: Math.random(),
-				user: page.user,
-				visitor: this.$store.state.i,
-				page: page,
-				url: url
-			}), e => {
-				console.dir(e);
-			});
-		});
+		this.fetch();
 	},
 
 	methods: {
+		fetch() {
+			this.$root.api('pages/show', {
+				name: this.pageName,
+				username: this.username,
+			}).then(page => {
+				this.page = page;
+				this.$emit('init', {
+					title: this.page.title,
+					icon: faStickyNote
+				});
+				const pageVars = this.getPageVars();
+				this.script = new Script(new ASEvaluator(this.page.variables, pageVars, {
+					randomSeed: Math.random(),
+					user: page.user,
+					visitor: this.$store.state.i,
+					page: page,
+					url: url
+				}), e => {
+					console.dir(e);
+				});
+			});
+		},
+
 		getPageVars() {
 			return collectPageVars(this.page.content);
 		},
diff --git a/src/client/app/mios.ts b/src/client/app/mios.ts
index fb1e7e13ec..ae1446b934 100644
--- a/src/client/app/mios.ts
+++ b/src/client/app/mios.ts
@@ -282,7 +282,7 @@ export default class MiOS extends EventEmitter {
 			// トークンが再生成されたとき
 			// このままではMisskeyが利用できないので強制的にサインアウトさせる
 			main.on('myTokenRegenerated', () => {
-				alert(locale['common']['my-token-regenerated'])
+				alert(locale['common']['my-token-regenerated']);
 				this.signout();
 			});
 		}
diff --git a/src/client/app/store.ts b/src/client/app/store.ts
index b137f79989..f229a2b7be 100644
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@@ -31,12 +31,8 @@ const defaultSettings = {
 	wallpaper: null,
 	webSearchEngine: 'https://www.google.com/?#q={{query}}',
 	mutedWords: [],
-	games: {
-		reversi: {
-			showBoardLabels: false,
-			useAvatarStones: true,
-		}
-	}
+	gamesReversiShowBoardLabels: false,
+	gamesReversiUseAvatarStones: true,
 };
 
 const defaultDeviceSettings = {