Clean up
This commit is contained in:
		
							parent
							
								
									58064ec633
								
							
						
					
					
						commit
						55be57ad21
					
				
					 6 changed files with 0 additions and 159 deletions
				
			
		| 
						 | 
					@ -40,17 +40,6 @@ export default Vue.component('misskey-flavored-markdown', {
 | 
				
			||||||
			ast = this.ast;
 | 
								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
 | 
							// Parse ast to DOM
 | 
				
			||||||
		const els = flatten(ast.map(token => {
 | 
							const els = flatten(ast.map(token => {
 | 
				
			||||||
			switch (token.type) {
 | 
								switch (token.type) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -47,9 +47,6 @@
 | 
				
			||||||
			</div>
 | 
								</div>
 | 
				
			||||||
			<mk-poll v-if="p.poll" :note="p"/>
 | 
								<mk-poll v-if="p.poll" :note="p"/>
 | 
				
			||||||
			<mk-url-preview v-for="url in urls" :url="url" :key="url"/>
 | 
								<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>
 | 
								<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="map" v-if="p.geo" ref="map"></div>
 | 
				
			||||||
			<div class="renote" v-if="p.renote">
 | 
								<div class="renote" v-if="p.renote">
 | 
				
			||||||
| 
						 | 
					@ -363,35 +360,6 @@ root(isDark)
 | 
				
			||||||
			> .mk-url-preview
 | 
								> .mk-url-preview
 | 
				
			||||||
				margin-top 8px
 | 
									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
 | 
							> footer
 | 
				
			||||||
			font-size 1.2em
 | 
								font-size 1.2em
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -32,9 +32,6 @@
 | 
				
			||||||
						<mk-media-list :media-list="p.media"/>
 | 
											<mk-media-list :media-list="p.media"/>
 | 
				
			||||||
					</div>
 | 
										</div>
 | 
				
			||||||
					<mk-poll v-if="p.poll" :note="p" ref="pollViewer"/>
 | 
										<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>
 | 
										<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="map" v-if="p.geo" ref="map"></div>
 | 
				
			||||||
					<div class="renote" v-if="p.renote">
 | 
										<div class="renote" v-if="p.renote">
 | 
				
			||||||
| 
						 | 
					@ -465,35 +462,6 @@ root(isDark)
 | 
				
			||||||
						&:empty
 | 
											&:empty
 | 
				
			||||||
							display none
 | 
												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
 | 
										.mk-url-preview
 | 
				
			||||||
						margin-top 8px
 | 
											margin-top 8px
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -32,9 +32,6 @@
 | 
				
			||||||
						<mk-media-list :media-list="p.media"/>
 | 
											<mk-media-list :media-list="p.media"/>
 | 
				
			||||||
					</div>
 | 
										</div>
 | 
				
			||||||
					<mk-poll v-if="p.poll" :note="p" ref="pollViewer"/>
 | 
										<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>
 | 
										<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">
 | 
										<div class="renote" v-if="p.renote">
 | 
				
			||||||
						<mk-note-preview :note="p.renote" :mini="true"/>
 | 
											<mk-note-preview :note="p.renote" :mini="true"/>
 | 
				
			||||||
| 
						 | 
					@ -373,31 +370,6 @@ root(isDark)
 | 
				
			||||||
					.mk-url-preview
 | 
										.mk-url-preview
 | 
				
			||||||
						margin-top 8px
 | 
											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
 | 
										> .media
 | 
				
			||||||
						> img
 | 
											> img
 | 
				
			||||||
							display block
 | 
												display block
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -40,9 +40,6 @@
 | 
				
			||||||
				<span v-if="p.deletedAt" style="opacity: 0.5">(%i18n:@deleted%)</span>
 | 
									<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"/>
 | 
									<misskey-flavored-markdown v-if="p.text" :text="p.text" :i="$store.state.i"/>
 | 
				
			||||||
			</div>
 | 
								</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">
 | 
								<div class="media" v-if="p.media.length > 0">
 | 
				
			||||||
				<mk-media-list :media-list="p.media" :raw="true"/>
 | 
									<mk-media-list :media-list="p.media" :raw="true"/>
 | 
				
			||||||
			</div>
 | 
								</div>
 | 
				
			||||||
| 
						 | 
					@ -370,31 +367,6 @@ root(isDark)
 | 
				
			||||||
					display block
 | 
										display block
 | 
				
			||||||
					max-width 100%
 | 
										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
 | 
							> .time
 | 
				
			||||||
			font-size 16px
 | 
								font-size 16px
 | 
				
			||||||
			color isDark ? #606984 : #c0c0c0
 | 
								color isDark ? #606984 : #c0c0c0
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -32,9 +32,6 @@
 | 
				
			||||||
						<mk-media-list :media-list="p.media"/>
 | 
											<mk-media-list :media-list="p.media"/>
 | 
				
			||||||
					</div>
 | 
										</div>
 | 
				
			||||||
					<mk-poll v-if="p.poll" :note="p" ref="pollViewer"/>
 | 
										<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"/>
 | 
										<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>
 | 
										<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="map" v-if="p.geo" ref="map"></div>
 | 
				
			||||||
| 
						 | 
					@ -417,31 +414,6 @@ root(isDark)
 | 
				
			||||||
					.mk-url-preview
 | 
										.mk-url-preview
 | 
				
			||||||
						margin-top 8px
 | 
											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
 | 
										> .media
 | 
				
			||||||
						> img
 | 
											> img
 | 
				
			||||||
							display block
 | 
												display block
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue