5.20.1

fix(package): update summaly to version 2.1.1 (#2135 )
Merge branch 'master' of https://github.com/syuilo/misskey
2018-08-10 01:04:40 +09:00 · 2018-08-10 01:02:20 +09:00 · 2018-08-10 00:51:43 +09:00 · 2018-08-10 00:51:40 +09:00 · 2018-08-10 00:25:25 +09:00 · 2018-08-10 00:25:16 +09:00
3 changed files with 20 additions and 8 deletions
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "5.20.0",
-	"clientVersion": "1.0.8099",
+	"version": "5.20.1",
+	"clientVersion": "1.0.8105",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@@ -154,7 +154,7 @@
 		"monk": "6.0.6",
 		"ms": "2.1.1",
 		"nan": "2.10.0",
-		"node-sass": "4.9.2",
+		"node-sass": "4.9.3",
 		"node-sass-json-importer": "3.3.1",
 		"nprogress": "0.2.0",
 		"object-assign-deep": "0.4.0",
@@ -187,7 +187,7 @@
 		"style-loader": "0.22.1",
 		"stylus": "0.54.5",
 		"stylus-loader": "3.0.2",
-		"summaly": "2.0.6",
+		"summaly": "2.1.1",
 		"systeminformation": "3.42.9",
 		"syuilo-password-strength": "0.0.1",
 		"textarea-caret": "3.1.0",
@@ -1,6 +1,8 @@
 <template>
-	<router-link class="mk-avatar" :to="user | userPage" :title="user | acct" :target="target" :style="style" v-if="disablePreview"></router-link>
-	<router-link class="mk-avatar" :to="user | userPage" :title="user | acct" :target="target" :style="style" v-else v-user-preview="user.id"></router-link>
+	<span class="mk-avatar" :title="user | acct" :style="style" v-if="disableLink && !disablePreview" v-user-preview="user.id" @click="onClick"></span>
+	<span class="mk-avatar" :title="user | acct" :style="style" v-else-if="disableLink && disablePreview" @click="onClick"></span>
+	<router-link class="mk-avatar" :to="user | userPage" :title="user | acct" :target="target" :style="style" v-else-if="!disableLink && !disablePreview" v-user-preview="user.id"></router-link>
+	<router-link class="mk-avatar" :to="user | userPage" :title="user | acct" :target="target" :style="style" v-else-if="!disableLink && disablePreview"></router-link>
 </template>

 <script lang="ts">
@@ -15,6 +17,10 @@ export default Vue.extend({
 			required: false,
 			default: null
 		},
+		disableLink: {
+			required: false,
+			default: false
+		},
 		disablePreview: {
 			required: false,
 			default: false
@@ -35,6 +41,11 @@ export default Vue.extend({
 				borderRadius: this.$store.state.settings.circleIcons ? '100%' : null
 			};
 		}
+	},
+	methods: {
+		onClick(e) {
+			this.$emit('click', e);
+		}
 	}
 });
 </script>
@@ -6,10 +6,11 @@
 	<div class="banner"
 		:style="$store.state.i.bannerUrl ? `background-image: url(${$store.state.i.bannerUrl})` : ''"
 		title="%i18n:@update-banner%"
-		@click="os.apis.updateBanner"
+		@click="() => os.apis.updateBanner()"
 	></div>
 	<mk-avatar class="avatar" :user="$store.state.i"
-		@click="os.apis.updateAvatar"
+		:disable-link="true"
+		@click="() => os.apis.updateAvatar()"
 		title="%i18n:@update-avatar%"
 	/>
 	<router-link class="name" :to="$store.state.i | userPage">{{ $store.state.i | userName }}</router-link>
Author	SHA1	Message	Date
syuilo	2c11cc3f0a	5.20.1	2018-08-10 01:04:40 +09:00
greenkeeper[bot]	7f65f896f9	fix(package): update summaly to version 2.1.1 (#2135 )	2018-08-10 01:02:20 +09:00
syuilo	def823ceea	Merge branch 'master' of https://github.com/syuilo/misskey	2018-08-10 00:51:43 +09:00
syuilo	454d294cf3	Fix #2133 など	2018-08-10 00:51:40 +09:00
greenkeeper[bot]	1affdbdbab	fix(package): update node-sass to version 4.9.3 (#2131 )	2018-08-10 00:25:25 +09:00
greenkeeper[bot]	52286f4be8	fix(package): update summaly to version 2.1.0 (#2132 )	2018-08-10 00:25:16 +09:00