From 55be57ad21599dafb41bd71db7453dba38f3da4c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 26 Jun 2018 18:47:09 +0900
Subject: [PATCH] Clean up
---
.../components/misskey-flavored-markdown.ts | 11 -------
.../desktop/views/components/note-detail.vue | 32 -------------------
.../desktop/views/components/notes.note.vue | 32 -------------------
.../desktop/views/pages/deck/deck.note.vue | 28 ----------------
.../mobile/views/components/note-detail.vue | 28 ----------------
.../app/mobile/views/components/note.vue | 28 ----------------
6 files changed, 159 deletions(-)
diff --git a/src/client/app/common/views/components/misskey-flavored-markdown.ts b/src/client/app/common/views/components/misskey-flavored-markdown.ts
index 30ad3ce3f2..c321c76104 100644
--- a/src/client/app/common/views/components/misskey-flavored-markdown.ts
+++ b/src/client/app/common/views/components/misskey-flavored-markdown.ts
@@ -40,17 +40,6 @@ export default Vue.component('misskey-flavored-markdown', {
ast = this.ast;
}
- if (ast.filter(x => x.type != 'hashtag').length == 0) {
- return;
- }
-
- while (ast[ast.length - 1] && (
- ast[ast.length - 1].type == 'hashtag' ||
- (ast[ast.length - 1].type == 'text' && ast[ast.length - 1].content == ' ') ||
- (ast[ast.length - 1].type == 'text' && ast[ast.length - 1].content == '\n'))) {
- ast.pop();
- }
-
// Parse ast to DOM
const els = flatten(ast.map(token => {
switch (token.type) {
diff --git a/src/client/app/desktop/views/components/note-detail.vue b/src/client/app/desktop/views/components/note-detail.vue
index a9640ff9c4..e3d16d7056 100644
--- a/src/client/app/desktop/views/components/note-detail.vue
+++ b/src/client/app/desktop/views/components/note-detail.vue
@@ -47,9 +47,6 @@
</div>
<mk-poll v-if="p.poll" :note="p"/>
<mk-url-preview v-for="url in urls" :url="url" :key="url"/>
- <div class="tags" v-if="p.tags && p.tags.length > 0">
- <router-link v-for="tag in p.tags" :key="tag" :to="`/tags/${tag}`">{{ tag }}</router-link>
- </div>
<a class="location" v-if="p.geo" :href="`http://maps.google.com/maps?q=${p.geo.coordinates[1]},${p.geo.coordinates[0]}`" target="_blank">%fa:map-marker-alt% %i18n:@location%</a>
<div class="map" v-if="p.geo" ref="map"></div>
<div class="renote" v-if="p.renote">
@@ -363,35 +360,6 @@ root(isDark)
> .mk-url-preview
margin-top 8px
- > .tags
- margin 4px 0 0 0
-
- > *
- display inline-block
- margin 0 8px 0 0
- padding 2px 8px 2px 16px
- font-size 90%
- color #8d969e
- background #edf0f3
- border-radius 4px
-
- &:before
- content ""
- display block
- position absolute
- top 0
- bottom 0
- left 4px
- width 8px
- height 8px
- margin auto 0
- background #fff
- border-radius 100%
-
- &:hover
- text-decoration none
- background #e2e7ec
-
> footer
font-size 1.2em
diff --git a/src/client/app/desktop/views/components/notes.note.vue b/src/client/app/desktop/views/components/notes.note.vue
index 24f8d2f65b..b8aff2d86e 100644
--- a/src/client/app/desktop/views/components/notes.note.vue
+++ b/src/client/app/desktop/views/components/notes.note.vue
@@ -32,9 +32,6 @@
<mk-media-list :media-list="p.media"/>
</div>
<mk-poll v-if="p.poll" :note="p" ref="pollViewer"/>
- <div class="tags" v-if="p.tags && p.tags.length > 0">
- <router-link v-for="tag in p.tags" :key="tag" :to="`/tags/${tag}`">{{ tag }}</router-link>
- </div>
<a class="location" v-if="p.geo" :href="`http://maps.google.com/maps?q=${p.geo.coordinates[1]},${p.geo.coordinates[0]}`" target="_blank">%fa:map-marker-alt% 位置情報</a>
<div class="map" v-if="p.geo" ref="map"></div>
<div class="renote" v-if="p.renote">
@@ -465,35 +462,6 @@ root(isDark)
&:empty
display none
- > .tags
- margin 4px 0 0 0
-
- > *
- display inline-block
- margin 0 0 4px 6px
- padding 2px 8px 2px 16px
- font-size 90%
- color $theme-color
- background isDark ? #313543 : #edf0f3
- border-radius 4px
-
- &:before
- content ""
- display block
- position absolute
- top 0
- bottom 0
- left 4px
- width 8px
- height 8px
- margin auto 0
- background isDark ? #282c37 : #fff
- border-radius 100%
-
- &:hover
- text-decoration none
- background #e2e7ec
-
.mk-url-preview
margin-top 8px
diff --git a/src/client/app/desktop/views/pages/deck/deck.note.vue b/src/client/app/desktop/views/pages/deck/deck.note.vue
index f4139c1bd8..c7df715a05 100644
--- a/src/client/app/desktop/views/pages/deck/deck.note.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.note.vue
@@ -32,9 +32,6 @@
<mk-media-list :media-list="p.media"/>
</div>
<mk-poll v-if="p.poll" :note="p" ref="pollViewer"/>
- <div class="tags" v-if="p.tags && p.tags.length > 0">
- <router-link v-for="tag in p.tags" :key="tag" :to="`/tags/${tag}`">{{ tag }}</router-link>
- </div>
<a class="location" v-if="p.geo" :href="`http://maps.google.com/maps?q=${p.geo.coordinates[1]},${p.geo.coordinates[0]}`" target="_blank">%fa:map-marker-alt% %i18n:@location%</a>
<div class="renote" v-if="p.renote">
<mk-note-preview :note="p.renote" :mini="true"/>
@@ -373,31 +370,6 @@ root(isDark)
.mk-url-preview
margin-top 8px
- > .tags
- margin 4px 0 0 0
-
- > *
- display inline-block
- margin 0 0 4px 6px
- padding 2px 8px 2px 16px
- font-size 90%
- color $theme-color
- background isDark ? #313543 : #edf0f3
- border-radius 4px
-
- &:before
- content ""
- display block
- position absolute
- top 0
- bottom 0
- left 4px
- width 8px
- height 8px
- margin auto 0
- background isDark ? #282c37 : #fff
- border-radius 100%
-
> .media
> img
display block
diff --git a/src/client/app/mobile/views/components/note-detail.vue b/src/client/app/mobile/views/components/note-detail.vue
index 48c9c8bcb0..fa15922183 100644
--- a/src/client/app/mobile/views/components/note-detail.vue
+++ b/src/client/app/mobile/views/components/note-detail.vue
@@ -40,9 +40,6 @@
<span v-if="p.deletedAt" style="opacity: 0.5">(%i18n:@deleted%)</span>
<misskey-flavored-markdown v-if="p.text" :text="p.text" :i="$store.state.i"/>
</div>
- <div class="tags" v-if="p.tags && p.tags.length > 0">
- <router-link v-for="tag in p.tags" :key="tag" :to="`/tags/${tag}`">{{ tag }}</router-link>
- </div>
<div class="media" v-if="p.media.length > 0">
<mk-media-list :media-list="p.media" :raw="true"/>
</div>
@@ -370,31 +367,6 @@ root(isDark)
display block
max-width 100%
- > .tags
- margin 4px 0 0 0
-
- > *
- display inline-block
- margin 0 8px 0 0
- padding 2px 8px 2px 16px
- font-size 90%
- color #8d969e
- background #edf0f3
- border-radius 4px
-
- &:before
- content ""
- display block
- position absolute
- top 0
- bottom 0
- left 4px
- width 8px
- height 8px
- margin auto 0
- background #fff
- border-radius 100%
-
> .time
font-size 16px
color isDark ? #606984 : #c0c0c0
diff --git a/src/client/app/mobile/views/components/note.vue b/src/client/app/mobile/views/components/note.vue
index c947a6c562..8fc8af7f8d 100644
--- a/src/client/app/mobile/views/components/note.vue
+++ b/src/client/app/mobile/views/components/note.vue
@@ -32,9 +32,6 @@
<mk-media-list :media-list="p.media"/>
</div>
<mk-poll v-if="p.poll" :note="p" ref="pollViewer"/>
- <div class="tags" v-if="p.tags && p.tags.length > 0">
- <router-link v-for="tag in p.tags" :key="tag" :to="`/tags/${tag}`">{{ tag }}</router-link>
- </div>
<mk-url-preview v-for="url in urls" :url="url" :key="url"/>
<a class="location" v-if="p.geo" :href="`http://maps.google.com/maps?q=${p.geo.coordinates[1]},${p.geo.coordinates[0]}`" target="_blank">%fa:map-marker-alt% %i18n:@location%</a>
<div class="map" v-if="p.geo" ref="map"></div>
@@ -417,31 +414,6 @@ root(isDark)
.mk-url-preview
margin-top 8px
- > .tags
- margin 4px 0 0 0
-
- > *
- display inline-block
- margin 0 0 4px 6px
- padding 2px 8px 2px 16px
- font-size 90%
- color $theme-color
- background isDark ? #313543 : #edf0f3
- border-radius 4px
-
- &:before
- content ""
- display block
- position absolute
- top 0
- bottom 0
- left 4px
- width 8px
- height 8px
- margin auto 0
- background isDark ? #282c37 : #fff
- border-radius 100%
-
> .media
> img
display block