clean up
This commit is contained in:
		
							parent
							
								
									8e7744a695
								
							
						
					
					
						commit
						601bc3e3cc
					
				
					 17 changed files with 7 additions and 161 deletions
				
			
		|  | @ -40,7 +40,6 @@ import MkButton from '@/components/ui/button.vue'; | |||
| import MkSwitch from '@/components/form/switch.vue'; | ||||
| import XModalWindow from '@/components/ui/modal-window.vue'; | ||||
| import MkDriveFileThumbnail from '@/components/drive-file-thumbnail.vue'; | ||||
| import Progress from '@/scripts/loading'; | ||||
| import bytes from '@/filters/bytes'; | ||||
| import * as os from '@/os'; | ||||
| 
 | ||||
|  | @ -74,11 +73,9 @@ export default defineComponent({ | |||
| 
 | ||||
| 	methods: { | ||||
| 		async fetch() { | ||||
| 			Progress.start(); | ||||
| 			this.file = await os.api('drive/files/show', { fileId: this.fileId }); | ||||
| 			this.info = await os.api('admin/drive/show-file', { fileId: this.fileId }); | ||||
| 			this.isSensitive = this.file.isSensitive; | ||||
| 			Progress.done(); | ||||
| 		}, | ||||
| 
 | ||||
| 		showUser() { | ||||
|  |  | |||
|  | @ -7,8 +7,6 @@ | |||
| 			src="antenna" | ||||
| 			:antenna="antennaId" | ||||
| 			:sound="true" | ||||
| 			@before="before()" | ||||
| 			@after="after()" | ||||
| 			@queue="queueUpdated" | ||||
| 		/> | ||||
| 	</div> | ||||
|  | @ -17,7 +15,6 @@ | |||
| 
 | ||||
| <script lang="ts"> | ||||
| import { defineComponent, defineAsyncComponent, computed } from 'vue'; | ||||
| import Progress from '@/scripts/loading'; | ||||
| import XTimeline from '@/components/timeline.vue'; | ||||
| import { scroll } from '@/scripts/scroll'; | ||||
| import * as os from '@/os'; | ||||
|  | @ -76,14 +73,6 @@ export default defineComponent({ | |||
| 	}, | ||||
| 
 | ||||
| 	methods: { | ||||
| 		before() { | ||||
| 			Progress.start(); | ||||
| 		}, | ||||
| 
 | ||||
| 		after() { | ||||
| 			Progress.done(); | ||||
| 		}, | ||||
| 
 | ||||
| 		queueUpdated(q) { | ||||
| 			this.queue = q; | ||||
| 		}, | ||||
|  |  | |||
|  | @ -1,14 +1,13 @@ | |||
| <template> | ||||
| <div class="jmelgwjh"> | ||||
| 	<div class="body"> | ||||
| 		<XNotes class="notes" :pagination="pagination" :detail="true" :prop="'note'" @before="before()" @after="after()"/> | ||||
| 		<XNotes class="notes" :pagination="pagination" :detail="true" :prop="'note'"/> | ||||
| 	</div> | ||||
| </div> | ||||
| </template> | ||||
| 
 | ||||
| <script lang="ts"> | ||||
| import { defineComponent } from 'vue'; | ||||
| import Progress from '@/scripts/loading'; | ||||
| import XNotes from '@/components/notes.vue'; | ||||
| import * as os from '@/os'; | ||||
| import * as symbols from '@/symbols'; | ||||
|  | @ -33,16 +32,6 @@ export default defineComponent({ | |||
| 			}, | ||||
| 		}; | ||||
| 	}, | ||||
| 
 | ||||
| 	methods: { | ||||
| 		before() { | ||||
| 			Progress.start(); | ||||
| 		}, | ||||
| 
 | ||||
| 		after() { | ||||
| 			Progress.done(); | ||||
| 		} | ||||
| 	} | ||||
| }); | ||||
| </script> | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,12 +1,11 @@ | |||
| <template> | ||||
| <MkSpacer :content-max="800"> | ||||
| 	<XNotes ref="notes" :pagination="pagination" @before="before" @after="after"/> | ||||
| 	<XNotes ref="notes" :pagination="pagination"/> | ||||
| </MkSpacer> | ||||
| </template> | ||||
| 
 | ||||
| <script lang="ts"> | ||||
| import { defineComponent } from 'vue'; | ||||
| import Progress from '@/scripts/loading'; | ||||
| import XNotes from '@/components/notes.vue'; | ||||
| import * as symbols from '@/symbols'; | ||||
| 
 | ||||
|  | @ -29,15 +28,5 @@ export default defineComponent({ | |||
| 			}, | ||||
| 		}; | ||||
| 	}, | ||||
| 
 | ||||
| 	methods: { | ||||
| 		before() { | ||||
| 			Progress.start(); | ||||
| 		}, | ||||
| 
 | ||||
| 		after() { | ||||
| 			Progress.done(); | ||||
| 		} | ||||
| 	} | ||||
| }); | ||||
| </script> | ||||
|  |  | |||
|  | @ -1,12 +1,11 @@ | |||
| <template> | ||||
| <MkSpacer :content-max="800"> | ||||
| 	<XNotes :pagination="pagination" @before="before()" @after="after()"/> | ||||
| 	<XNotes :pagination="pagination"/> | ||||
| </MkSpacer> | ||||
| </template> | ||||
| 
 | ||||
| <script lang="ts"> | ||||
| import { defineComponent } from 'vue'; | ||||
| import Progress from '@/scripts/loading'; | ||||
| import XNotes from '@/components/notes.vue'; | ||||
| import * as symbols from '@/symbols'; | ||||
| 
 | ||||
|  | @ -28,15 +27,5 @@ export default defineComponent({ | |||
| 			}, | ||||
| 		}; | ||||
| 	}, | ||||
| 
 | ||||
| 	methods: { | ||||
| 		before() { | ||||
| 			Progress.start(); | ||||
| 		}, | ||||
| 
 | ||||
| 		after() { | ||||
| 			Progress.done(); | ||||
| 		} | ||||
| 	} | ||||
| }); | ||||
| </script> | ||||
|  |  | |||
|  | @ -1,12 +1,11 @@ | |||
| <template> | ||||
| <MkSpacer :content-max="800"> | ||||
| 	<XNotes :pagination="pagination" @before="before()" @after="after()"/> | ||||
| 	<XNotes :pagination="pagination"/> | ||||
| </MkSpacer> | ||||
| </template> | ||||
| 
 | ||||
| <script lang="ts"> | ||||
| import { defineComponent } from 'vue'; | ||||
| import Progress from '@/scripts/loading'; | ||||
| import XNotes from '@/components/notes.vue'; | ||||
| import * as symbols from '@/symbols'; | ||||
| 
 | ||||
|  | @ -31,15 +30,5 @@ export default defineComponent({ | |||
| 			}, | ||||
| 		}; | ||||
| 	}, | ||||
| 
 | ||||
| 	methods: { | ||||
| 		before() { | ||||
| 			Progress.start(); | ||||
| 		}, | ||||
| 
 | ||||
| 		after() { | ||||
| 			Progress.done(); | ||||
| 		} | ||||
| 	} | ||||
| }); | ||||
| </script> | ||||
|  |  | |||
|  | @ -35,7 +35,6 @@ | |||
| 
 | ||||
| <script lang="ts"> | ||||
| import { computed, defineComponent } from 'vue'; | ||||
| import Progress from '@/scripts/loading'; | ||||
| import MkButton from '@/components/ui/button.vue'; | ||||
| import * as os from '@/os'; | ||||
| import * as symbols from '@/symbols'; | ||||
|  | @ -73,7 +72,6 @@ export default defineComponent({ | |||
| 
 | ||||
| 	methods: { | ||||
| 		fetch() { | ||||
| 			Progress.start(); | ||||
| 			os.api('users/groups/show', { | ||||
| 				groupId: this.groupId | ||||
| 			}).then(group => { | ||||
|  | @ -82,7 +80,6 @@ export default defineComponent({ | |||
| 					userIds: this.group.userIds | ||||
| 				}).then(users => { | ||||
| 					this.users = users; | ||||
| 					Progress.done(); | ||||
| 				}); | ||||
| 			}); | ||||
| 		}, | ||||
|  |  | |||
|  | @ -36,7 +36,6 @@ | |||
| 
 | ||||
| <script lang="ts"> | ||||
| import { computed, defineComponent } from 'vue'; | ||||
| import Progress from '@/scripts/loading'; | ||||
| import MkButton from '@/components/ui/button.vue'; | ||||
| import * as os from '@/os'; | ||||
| import * as symbols from '@/symbols'; | ||||
|  | @ -68,7 +67,6 @@ export default defineComponent({ | |||
| 
 | ||||
| 	methods: { | ||||
| 		fetch() { | ||||
| 			Progress.start(); | ||||
| 			os.api('users/lists/show', { | ||||
| 				listId: this.$route.params.list | ||||
| 			}).then(list => { | ||||
|  | @ -77,7 +75,6 @@ export default defineComponent({ | |||
| 					userIds: this.list.userIds | ||||
| 				}).then(users => { | ||||
| 					this.users = users; | ||||
| 					Progress.done(); | ||||
| 				}); | ||||
| 			}); | ||||
| 		}, | ||||
|  |  | |||
|  | @ -1,14 +1,13 @@ | |||
| <template> | ||||
| <MkSpacer :content-max="800"> | ||||
| 	<div class="clupoqwt"> | ||||
| 		<XNotifications class="notifications" :include-types="includeTypes" :unread-only="tab === 'unread'" @before="before" @after="after"/> | ||||
| 		<XNotifications class="notifications" :include-types="includeTypes" :unread-only="tab === 'unread'"/> | ||||
| 	</div> | ||||
| </MkSpacer> | ||||
| </template> | ||||
| 
 | ||||
| <script lang="ts"> | ||||
| import { computed, defineComponent } from 'vue'; | ||||
| import Progress from '@/scripts/loading'; | ||||
| import XNotifications from '@/components/notifications.vue'; | ||||
| import * as os from '@/os'; | ||||
| import * as symbols from '@/symbols'; | ||||
|  | @ -53,14 +52,6 @@ export default defineComponent({ | |||
| 	}, | ||||
| 
 | ||||
| 	methods: { | ||||
| 		before() { | ||||
| 			Progress.start(); | ||||
| 		}, | ||||
| 
 | ||||
| 		after() { | ||||
| 			Progress.done(); | ||||
| 		}, | ||||
| 
 | ||||
| 		setFilter(ev) { | ||||
| 			const typeItems = notificationTypes.map(t => ({ | ||||
| 				text: this.$t(`_notification._types.${t}`), | ||||
|  |  | |||
|  | @ -1,14 +1,13 @@ | |||
| <template> | ||||
| <div class="_section"> | ||||
| 	<div class="_content"> | ||||
| 		<XNotes ref="notes" :pagination="pagination" @before="before" @after="after"/> | ||||
| 		<XNotes ref="notes" :pagination="pagination"/> | ||||
| 	</div> | ||||
| </div> | ||||
| </template> | ||||
| 
 | ||||
| <script lang="ts"> | ||||
| import { computed, defineComponent } from 'vue'; | ||||
| import Progress from '@/scripts/loading'; | ||||
| import XNotes from '@/components/notes.vue'; | ||||
| import * as symbols from '@/symbols'; | ||||
| 
 | ||||
|  | @ -39,15 +38,5 @@ export default defineComponent({ | |||
| 			(this.$refs.notes as any).reload(); | ||||
| 		} | ||||
| 	}, | ||||
| 
 | ||||
| 	methods: { | ||||
| 		before() { | ||||
| 			Progress.start(); | ||||
| 		}, | ||||
| 
 | ||||
| 		after() { | ||||
| 			Progress.done(); | ||||
| 		} | ||||
| 	} | ||||
| }); | ||||
| </script> | ||||
|  |  | |||
|  | @ -1,12 +1,11 @@ | |||
| <template> | ||||
| <div class="_section"> | ||||
| 	<XNotes ref="notes" class="_content" :pagination="pagination" @before="before" @after="after"/> | ||||
| 	<XNotes ref="notes" class="_content" :pagination="pagination"/> | ||||
| </div> | ||||
| </template> | ||||
| 
 | ||||
| <script lang="ts"> | ||||
| import { defineComponent } from 'vue'; | ||||
| import Progress from '@/scripts/loading'; | ||||
| import XNotes from '@/components/notes.vue'; | ||||
| import * as symbols from '@/symbols'; | ||||
| 
 | ||||
|  | @ -43,15 +42,5 @@ export default defineComponent({ | |||
| 			(this.$refs.notes as any).reload(); | ||||
| 		} | ||||
| 	}, | ||||
| 
 | ||||
| 	methods: { | ||||
| 		before() { | ||||
| 			Progress.start(); | ||||
| 		}, | ||||
| 
 | ||||
| 		after() { | ||||
| 			Progress.done(); | ||||
| 		} | ||||
| 	} | ||||
| }); | ||||
| </script> | ||||
|  |  | |||
|  | @ -10,8 +10,6 @@ | |||
| 				class="tl" | ||||
| 				:src="src" | ||||
| 				:sound="true" | ||||
| 				@before="before()" | ||||
| 				@after="after()" | ||||
| 				@queue="queueUpdated" | ||||
| 			/> | ||||
| 		</div> | ||||
|  | @ -21,7 +19,6 @@ | |||
| 
 | ||||
| <script lang="ts"> | ||||
| import { defineComponent, defineAsyncComponent, computed } from 'vue'; | ||||
| import Progress from '@/scripts/loading'; | ||||
| import XTimeline from '@/components/timeline.vue'; | ||||
| import XPostForm from '@/components/post-form.vue'; | ||||
| import { scroll } from '@/scripts/scroll'; | ||||
|  | @ -118,14 +115,6 @@ export default defineComponent({ | |||
| 	}, | ||||
| 
 | ||||
| 	methods: { | ||||
| 		before() { | ||||
| 			Progress.start(); | ||||
| 		}, | ||||
| 
 | ||||
| 		after() { | ||||
| 			Progress.done(); | ||||
| 		}, | ||||
| 
 | ||||
| 		queueUpdated(q) { | ||||
| 			this.queue = q; | ||||
| 		}, | ||||
|  |  | |||
|  | @ -7,8 +7,6 @@ | |||
| 			src="list" | ||||
| 			:list="listId" | ||||
| 			:sound="true" | ||||
| 			@before="before()" | ||||
| 			@after="after()" | ||||
| 			@queue="queueUpdated" | ||||
| 		/> | ||||
| 	</div> | ||||
|  | @ -17,7 +15,6 @@ | |||
| 
 | ||||
| <script lang="ts"> | ||||
| import { defineComponent, defineAsyncComponent, computed } from 'vue'; | ||||
| import Progress from '@/scripts/loading'; | ||||
| import XTimeline from '@/components/timeline.vue'; | ||||
| import { scroll } from '@/scripts/scroll'; | ||||
| import * as os from '@/os'; | ||||
|  | @ -76,14 +73,6 @@ export default defineComponent({ | |||
| 	}, | ||||
| 
 | ||||
| 	methods: { | ||||
| 		before() { | ||||
| 			Progress.start(); | ||||
| 		}, | ||||
| 
 | ||||
| 		after() { | ||||
| 			Progress.done(); | ||||
| 		}, | ||||
| 
 | ||||
| 		queueUpdated(q) { | ||||
| 			this.queue = q; | ||||
| 		}, | ||||
|  |  | |||
|  | @ -205,7 +205,6 @@ import MkFolder from '@/components/ui/folder.vue'; | |||
| import MkRemoteCaution from '@/components/remote-caution.vue'; | ||||
| import MkTab from '@/components/tab.vue'; | ||||
| import MkInfo from '@/components/ui/info.vue'; | ||||
| import Progress from '@/scripts/loading'; | ||||
| import * as Acct from 'misskey-js/built/acct'; | ||||
| import { getScrollPosition } from '@/scripts/scroll'; | ||||
| import { getUserMenu } from '@/scripts/get-user-menu'; | ||||
|  | @ -328,13 +327,10 @@ export default defineComponent({ | |||
| 		fetch() { | ||||
| 			if (this.acct == null) return; | ||||
| 			this.user = null; | ||||
| 			Progress.start(); | ||||
| 			os.api('users/show', Acct.parse(this.acct)).then(user => { | ||||
| 				this.user = user; | ||||
| 			}).catch(e => { | ||||
| 				this.error = e; | ||||
| 			}).finally(() => { | ||||
| 				Progress.done(); | ||||
| 			}); | ||||
| 		}, | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,11 +0,0 @@ | |||
| export default { | ||||
| 	start: () => { | ||||
| 		// TODO
 | ||||
| 	}, | ||||
| 	done: () => { | ||||
| 		// TODO
 | ||||
| 	}, | ||||
| 	set: val => { | ||||
| 		// TODO
 | ||||
| 	} | ||||
| }; | ||||
|  | @ -8,7 +8,6 @@ | |||
| 
 | ||||
| <script lang="ts"> | ||||
| import { defineComponent } from 'vue'; | ||||
| import Progress from '@/scripts/loading'; | ||||
| import XColumn from './column.vue'; | ||||
| import XNotes from '@/components/notes.vue'; | ||||
| import * as os from '@/os'; | ||||
|  | @ -41,15 +40,5 @@ export default defineComponent({ | |||
| 			}, | ||||
| 		} | ||||
| 	}, | ||||
| 
 | ||||
| 	methods: { | ||||
| 		before() { | ||||
| 			Progress.start(); | ||||
| 		}, | ||||
| 
 | ||||
| 		after() { | ||||
| 			Progress.done(); | ||||
| 		} | ||||
| 	} | ||||
| }); | ||||
| </script> | ||||
|  |  | |||
|  | @ -8,7 +8,6 @@ | |||
| 
 | ||||
| <script lang="ts"> | ||||
| import { defineComponent } from 'vue'; | ||||
| import Progress from '@/scripts/loading'; | ||||
| import XColumn from './column.vue'; | ||||
| import XNotes from '@/components/notes.vue'; | ||||
| import * as os from '@/os'; | ||||
|  | @ -38,15 +37,5 @@ export default defineComponent({ | |||
| 			}, | ||||
| 		} | ||||
| 	}, | ||||
| 
 | ||||
| 	methods: { | ||||
| 		before() { | ||||
| 			Progress.start(); | ||||
| 		}, | ||||
| 
 | ||||
| 		after() { | ||||
| 			Progress.done(); | ||||
| 		} | ||||
| 	} | ||||
| }); | ||||
| </script> | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue