mirror/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2024-12-25 22:22:51 +09:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

✌️

Browse Source
This commit is contained in:
syuilo 2018-09-15 21:53:04 +09:00
parent 7b2b7d1456
commit 25b0a93acd
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
20 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/app/common/views/components/menu.vue
View File

@ -108,7 +108,7 @@ export default Vue.extend({
easing: 'easeInBack', easing: 'easeInBack',
complete: () => { complete: () => {
this.$emit('closed'); this.$emit('closed');
this.$destroy(); this.destroyDom();
} }
}); });
} }

8
src/client/app/common/views/components/note-menu.vue
View File

@ -64,7 +64,7 @@ export default Vue.extend({
(this as any).api('i/pin', { (this as any).api('i/pin', {
noteId: this.note.id noteId: this.note.id
}).then(() => { }).then(() => {
this.$destroy(); this.destroyDom();
}); });
}, },
@ -73,7 +73,7 @@ export default Vue.extend({
(this as any).api('notes/delete', { (this as any).api('notes/delete', {
noteId: this.note.id noteId: this.note.id
}).then(() => { }).then(() => {
this.$destroy(); this.destroyDom();
}); });
}, },
@ -81,13 +81,13 @@ export default Vue.extend({
(this as any).api('notes/favorites/create', { (this as any).api('notes/favorites/create', {
noteId: this.note.id noteId: this.note.id
}).then(() => { }).then(() => {
this.$destroy(); this.destroyDom();
}); });
}, },
closed() { closed() {
this.$nextTick(() => { this.$nextTick(() => {
this.$destroy(); this.destroyDom();
}); });
} }
} }

4
src/client/app/common/views/components/reaction-picker.vue
View File

@ -95,7 +95,7 @@ export default Vue.extend({
reaction: reaction reaction: reaction
}).then(() => { }).then(() => {
if (this.cb) this.cb(); if (this.cb) this.cb();
this.$destroy(); this.destroyDom();
}); });
}, },
onMouseover(e) { onMouseover(e) {
@ -120,7 +120,7 @@ export default Vue.extend({
scale: 0.5, scale: 0.5,
duration: 200, duration: 200,
easing: 'easeInBack', easing: 'easeInBack',
complete: () => this.$destroy() complete: () => this.destroyDom()
}); });
} }
} }

4
src/client/app/common/views/components/visibility-chooser.vue
View File

@ -101,7 +101,7 @@ export default Vue.extend({
this.$store.commit('device/setVisibility', visibility); this.$store.commit('device/setVisibility', visibility);
} }
this.$emit('chosen', visibility); this.$emit('chosen', visibility);
this.$destroy(); this.destroyDom();
}, },
close() { close() {
(this.$refs.backdrop as any).style.pointerEvents = 'none'; (this.$refs.backdrop as any).style.pointerEvents = 'none';
@ -119,7 +119,7 @@ export default Vue.extend({
scale: 0.5, scale: 0.5,
duration: 200, duration: 200,
easing: 'easeInBack', easing: 'easeInBack',
complete: () => this.$destroy() complete: () => this.destroyDom()
}); });
} }
} }

2
src/client/app/common/views/directives/autocomplete.ts
View File

@ -167,7 +167,7 @@ class Autocomplete {
private close() { private close() {
if (this.suggestion == null) return; if (this.suggestion == null) return;
this.suggestion.$destroy(); this.suggestion.destroyDom();
this.suggestion = null; this.suggestion = null;
this.textarea.focus(); this.textarea.focus();

2
src/client/app/desktop/views/components/context-menu.vue
View File

@ -64,7 +64,7 @@ export default Vue.extend({
}); });
this.$emit('closed'); this.$emit('closed');
this.$destroy(); this.destroyDom();
} }
} }
}); });

2
src/client/app/desktop/views/components/dialog.vue
View File

@ -78,7 +78,7 @@ export default Vue.extend({
scale: 0.8, scale: 0.8,
duration: 300, duration: 300,
easing: [ 0.5, -0.5, 1, 0.5 ], easing: [ 0.5, -0.5, 1, 0.5 ],
complete: () => this.$destroy() complete: () => this.destroyDom()
}); });
}, },
onBgClick() { onBgClick() {

2
src/client/app/desktop/views/components/friends-maker.vue
View File

@ -14,7 +14,7 @@
<p class="empty" v-if="!fetching && users.length == 0">%i18n:@empty%</p> <p class="empty" v-if="!fetching && users.length == 0">%i18n:@empty%</p>
<p class="fetching" v-if="fetching">%fa:spinner .pulse .fw%%i18n:@fetching%<mk-ellipsis/></p> <p class="fetching" v-if="fetching">%fa:spinner .pulse .fw%%i18n:@fetching%<mk-ellipsis/></p>
<a class="refresh" @click="refresh">%i18n:@refresh%</a> <a class="refresh" @click="refresh">%i18n:@refresh%</a>
<button class="close" @click="$destroy()" title="%i18n:@close%">%fa:times%</button> <button class="close" @click="destroyDom()" title="%i18n:@close%">%fa:times%</button>
</div> </div>
</template> </template>

2
src/client/app/desktop/views/components/media-image-dialog.vue
View File

@ -26,7 +26,7 @@ export default Vue.extend({
opacity: 0, opacity: 0,
duration: 100, duration: 100,
easing: 'linear', easing: 'linear',
complete: () => this.$destroy() complete: () => this.destroyDom()
}); });
} }
} }

2
src/client/app/desktop/views/components/media-video-dialog.vue
View File

@ -28,7 +28,7 @@ export default Vue.extend({
opacity: 0, opacity: 0,
duration: 100, duration: 100,
easing: 'linear', easing: 'linear',
complete: () => this.$destroy() complete: () => this.destroyDom()
}); });
} }
} }

2
src/client/app/desktop/views/components/ui-notification.vue
View File

@ -27,7 +27,7 @@ export default Vue.extend({
translateY: -64, translateY: -64,
duration: 500, duration: 500,
easing: 'easeInElastic', easing: 'easeInElastic',
complete: () => this.$destroy() complete: () => this.destroyDom()
}); });
}, 6000); }, 6000);
}); });

2
src/client/app/desktop/views/components/user-preview.vue
View File

@ -75,7 +75,7 @@ export default Vue.extend({
'margin-top': '-8px', 'margin-top': '-8px',
duration: 200, duration: 200,
easing: 'easeOutQuad', easing: 'easeOutQuad',
complete: () => this.$destroy() complete: () => this.destroyDom()
}); });
} }
} }

4
src/client/app/desktop/views/components/window.vue
View File

@ -106,7 +106,7 @@ export default Vue.extend({
mounted() { mounted() {
if (this.preventMount) { if (this.preventMount) {
this.$destroy(); this.destroyDom();
return; return;
} }
@ -190,7 +190,7 @@ export default Vue.extend({
}); });
setTimeout(() => { setTimeout(() => {
this.$destroy(); this.destroyDom();
this.$emit('closed'); this.$emit('closed');
}, 300); }, 300);
}, },

10
src/client/app/init.ts
View File

@ -31,9 +31,13 @@ require('./common/views/widgets');
require('./common/views/filters'); require('./common/views/filters');
Vue.mixin({ Vue.mixin({
destroyed(this: any) { methods: {
if (this.$el.parentNode) { destroyDom() {
this.$el.parentNode.removeChild(this.$el); this.$destroy();
if (this.$el.parentNode) {
this.$el.parentNode.removeChild(this.$el);
}
} }
} }
}); });

2
src/client/app/mobile/views/components/dialog.vue
View File

@ -78,7 +78,7 @@ export default Vue.extend({
scale: 0.8, scale: 0.8,
duration: 300, duration: 300,
easing: [ 0.5, -0.5, 1, 0.5 ], easing: [ 0.5, -0.5, 1, 0.5 ],
complete: () => this.$destroy() complete: () => this.destroyDom()
}); });
}, },
onBgClick() { onBgClick() {

6
src/client/app/mobile/views/components/drive-file-chooser.vue
View File

@ -31,15 +31,15 @@ export default Vue.extend({
}, },
onSelected(file) { onSelected(file) {
this.$emit('selected', file); this.$emit('selected', file);
this.$destroy(); this.destroyDom();
}, },
cancel() { cancel() {
this.$emit('canceled'); this.$emit('canceled');
this.$destroy(); this.destroyDom();
}, },
ok() { ok() {
this.$emit('selected', this.files); this.$emit('selected', this.files);
this.$destroy(); this.destroyDom();
} }
} }
}); });

4
src/client/app/mobile/views/components/drive-folder-chooser.vue
View File

@ -19,11 +19,11 @@ export default Vue.extend({
methods: { methods: {
cancel() { cancel() {
this.$emit('canceled'); this.$emit('canceled');
this.$destroy(); this.destroyDom();
}, },
ok() { ok() {
this.$emit('selected', (this.$refs.browser as any).folder); this.$emit('selected', (this.$refs.browser as any).folder);
this.$destroy(); this.destroyDom();
} }
} }
}); });

2
src/client/app/mobile/views/components/friends-maker.vue
View File

@ -47,7 +47,7 @@ export default Vue.extend({
this.fetch(); this.fetch();
}, },
close() { close() {
this.$destroy(); this.destroyDom();
} }
} }
}); });

2
src/client/app/mobile/views/components/notify.vue
View File

@ -32,7 +32,7 @@ export default Vue.extend({
[this.pos]: `-${this.$el.offsetHeight}px`, [this.pos]: `-${this.$el.offsetHeight}px`,
duration: 500, duration: 500,
easing: 'easeOutQuad', easing: 'easeOutQuad',
complete: () => this.$destroy() complete: () => this.destroyDom()
}); });
}, 6000); }, 6000);
}); });

2
src/client/app/mobile/views/components/post-form-dialog.vue
View File

@ -79,7 +79,7 @@ export default Vue.extend({
translateY: 16, translateY: 16,
duration: 300, duration: 300,
easing: 'easeOutQuad', easing: 'easeOutQuad',
complete: () => this.$destroy() complete: () => this.destroyDom()
}); });
}, },