1
1
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-15 07:08:56 +09:00
This commit is contained in:
こぴなたみぽ 2018-02-07 18:21:37 +09:00
parent 07efc8e150
commit 1a6a72591f
30 changed files with 54 additions and 67 deletions

View File

@ -119,7 +119,7 @@
post_id: this.post.id post_id: this.post.id
}).then(() => { }).then(() => {
if (this.opts.cb) this.opts.cb('pinned', '%i18n:common.tags.mk-post-menu.pinned%'); if (this.opts.cb) this.opts.cb('pinned', '%i18n:common.tags.mk-post-menu.pinned%');
this.unmount(); this.$destroy();
}); });
}; };
@ -130,7 +130,7 @@
category: category category: category
}).then(() => { }).then(() => {
if (this.opts.cb) this.opts.cb('categorized', '%i18n:common.tags.mk-post-menu.categorized%'); if (this.opts.cb) this.opts.cb('categorized', '%i18n:common.tags.mk-post-menu.categorized%');
this.unmount(); this.$destroy();
}); });
}; };
@ -150,7 +150,7 @@
scale: 0.5, scale: 0.5,
duration: 200, duration: 200,
easing: 'easeInBack', easing: 'easeInBack',
complete: () => this.unmount() complete: () => this.$destroy()
}); });
}; };
</script> </script>

View File

@ -74,41 +74,28 @@
}, },
onMouseout: function(e) { onMouseout: function(e) {
this.title = placeholder; this.title = placeholder;
},
close: function() {
this.$refs.backdrop.style.pointerEvents = 'none';
anime({
targets: this.$refs.backdrop,
opacity: 0,
duration: 200,
easing: 'linear'
});
this.$refs.popover.style.pointerEvents = 'none';
anime({
targets: this.$refs.popover,
opacity: 0,
scale: 0.5,
duration: 200,
easing: 'easeInBack',
complete: () => this.$destroy()
});
} }
} }
}; };
this.mixin('api');
this.post = this.opts.post;
this.source = this.opts.source;
this.on('mount', () => {
});
this.react = reaction => {
};
this.close = () => {
this.$refs.backdrop.style.pointerEvents = 'none';
anime({
targets: this.$refs.backdrop,
opacity: 0,
duration: 200,
easing: 'linear'
});
this.$refs.popover.style.pointerEvents = 'none';
anime({
targets: this.$refs.popover,
opacity: 0,
scale: 0.5,
duration: 200,
easing: 'easeInBack',
complete: () => this.unmount()
});
};
</script> </script>
<mk-reaction-picker> <mk-reaction-picker>

View File

@ -132,7 +132,7 @@
}); });
this.trigger('closed'); this.trigger('closed');
this.unmount(); this.$destroy();
}; };
</script> </script>
</mk-contextmenu> </mk-contextmenu>

View File

@ -69,7 +69,7 @@
opacity: 0, opacity: 0,
duration: 300, duration: 300,
easing: 'linear', easing: 'linear',
complete: () => this.unmount() complete: () => this.$destroy()
}); });
}; };

View File

@ -130,7 +130,7 @@
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.unmount() complete: () => this.$destroy()
}); });
}; };

View File

@ -60,7 +60,7 @@
show_donation: false show_donation: false
}); });
this.unmount(); this.$destroy();
}; };
</script> </script>
</mk-donation> </mk-donation>

View File

@ -18,7 +18,7 @@
this.on('mount', () => { this.on('mount', () => {
this.$refs.ctx.on('closed', () => { this.$refs.ctx.on('closed', () => {
this.trigger('closed'); this.trigger('closed');
this.unmount(); this.$destroy();
}); });
}); });

View File

@ -43,7 +43,7 @@
this.on('mount', () => { this.on('mount', () => {
this.$refs.window.on('closed', () => { this.$refs.window.on('closed', () => {
this.unmount(); this.$destroy();
}); });
this.api('drive').then(info => { this.api('drive').then(info => {

View File

@ -50,7 +50,7 @@
this.on('mount', () => { this.on('mount', () => {
this.$refs.ctx.on('closed', () => { this.$refs.ctx.on('closed', () => {
this.trigger('closed'); this.trigger('closed');
this.unmount(); this.$destroy();
}); });
}); });

View File

@ -30,7 +30,7 @@
this.$refs.ctx.on('closed', () => { this.$refs.ctx.on('closed', () => {
this.trigger('closed'); this.trigger('closed');
this.unmount(); this.$destroy();
}); });
}; };

View File

@ -163,7 +163,7 @@
}; };
this.close = () => { this.close = () => {
this.unmount(); this.$destroy();
}; };
</script> </script>
</mk-following-setuper> </mk-following-setuper>

View File

@ -165,7 +165,7 @@
opacity: 0, opacity: 0,
duration: 100, duration: 100,
easing: 'linear', easing: 'linear',
complete: () => this.unmount() complete: () => this.$destroy()
}); });
}; };
</script> </script>

View File

@ -142,7 +142,7 @@
}); });
this.$refs.window.on('closed', () => { this.$refs.window.on('closed', () => {
this.unmount(); this.$destroy();
}); });
}); });

View File

@ -25,7 +25,7 @@
this.on('mount', () => { this.on('mount', () => {
this.$refs.window.on('closed', () => { this.$refs.window.on('closed', () => {
this.unmount(); this.$destroy();
}); });
}); });
</script> </script>

View File

@ -21,7 +21,7 @@
<script> <script>
this.on('mount', () => { this.on('mount', () => {
this.$refs.window.on('closed', () => { this.$refs.window.on('closed', () => {
this.unmount(); this.$destroy();
}); });
this.$refs.window.refs.index.on('navigate-user', user => { this.$refs.window.refs.index.on('navigate-user', user => {

View File

@ -45,7 +45,7 @@
this.$refs.window.refs.form.focus(); this.$refs.window.refs.form.focus();
this.$refs.window.on('closed', () => { this.$refs.window.on('closed', () => {
this.unmount(); this.$destroy();
}); });
this.$refs.window.refs.form.on('post', () => { this.$refs.window.refs.form.on('post', () => {

View File

@ -79,7 +79,7 @@
this.on('mount', () => { this.on('mount', () => {
this.$refs.window.on('closed', () => { this.$refs.window.on('closed', () => {
this.unmount(); this.$destroy();
}); });
}); });

View File

@ -36,7 +36,7 @@
document.addEventListener('keydown', this.onDocumentKeydown); document.addEventListener('keydown', this.onDocumentKeydown);
this.$refs.window.on('closed', () => { this.$refs.window.on('closed', () => {
this.unmount(); this.$destroy();
}); });
}); });

View File

@ -153,7 +153,7 @@
}); });
this.$refs.window.on('closed', () => { this.$refs.window.on('closed', () => {
this.unmount(); this.$destroy();
}); });
}); });

View File

@ -96,7 +96,7 @@
this.on('mount', () => { this.on('mount', () => {
this.$refs.window.on('closed', () => { this.$refs.window.on('closed', () => {
this.unmount(); this.$destroy();
}); });
}); });

View File

@ -42,7 +42,7 @@
this.close = e => { this.close = e => {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
this.unmount(); this.$destroy();
}; };
</script> </script>
</mk-set-avatar-suggestion> </mk-set-avatar-suggestion>

View File

@ -42,7 +42,7 @@
this.close = e => { this.close = e => {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
this.unmount(); this.$destroy();
}; };
</script> </script>
</mk-set-banner-suggestion> </mk-set-banner-suggestion>

View File

@ -19,7 +19,7 @@
<script> <script>
this.on('mount', () => { this.on('mount', () => {
this.$refs.window.on('closed', () => { this.$refs.window.on('closed', () => {
this.unmount(); this.$destroy();
}); });
}); });

View File

@ -888,7 +888,7 @@
translateY: -64, translateY: -64,
duration: 500, duration: 500,
easing: 'easeInElastic', easing: 'easeInElastic',
complete: () => this.unmount() complete: () => this.$destroy()
}); });
}, 6000); }, 6000);
}); });

View File

@ -142,7 +142,7 @@
'margin-top': '-8px', 'margin-top': '-8px',
duration: 200, duration: 200,
easing: 'easeOutQuad', easing: 'easeOutQuad',
complete: () => this.unmount() complete: () => this.$destroy()
}); });
}; };
</script> </script>

View File

@ -58,12 +58,12 @@
<script> <script>
this.cancel = () => { this.cancel = () => {
this.trigger('canceled'); this.trigger('canceled');
this.unmount(); this.$destroy();
}; };
this.ok = () => { this.ok = () => {
this.trigger('selected', this.$refs.browser.folder); this.trigger('selected', this.$refs.browser.folder);
this.unmount(); this.$destroy();
}; };
</script> </script>
</mk-drive-folder-selector> </mk-drive-folder-selector>

View File

@ -71,18 +71,18 @@
this.$refs.browser.on('selected', file => { this.$refs.browser.on('selected', file => {
this.trigger('selected', file); this.trigger('selected', file);
this.unmount(); this.$destroy();
}); });
}); });
this.cancel = () => { this.cancel = () => {
this.trigger('canceled'); this.trigger('canceled');
this.unmount(); this.$destroy();
}; };
this.ok = () => { this.ok = () => {
this.trigger('selected', this.files); this.trigger('selected', this.files);
this.unmount(); this.$destroy();
}; };
</script> </script>
</mk-drive-selector> </mk-drive-selector>

View File

@ -124,7 +124,7 @@
}; };
this.close = () => { this.close = () => {
this.unmount(); this.$destroy();
}; };
</script> </script>
</mk-init-following> </mk-init-following>

View File

@ -32,7 +32,7 @@
bottom: '-64px', bottom: '-64px',
duration: 500, duration: 500,
easing: 'easeOutQuad', easing: 'easeOutQuad',
complete: () => this.unmount() complete: () => this.$destroy()
}); });
}, 6000); }, 6000);
}); });

View File

@ -255,7 +255,7 @@
poll: this.poll ? this.$refs.poll.get() : undefined poll: this.poll ? this.$refs.poll.get() : undefined
}).then(data => { }).then(data => {
this.trigger('post'); this.trigger('post');
this.unmount(); this.$destroy();
}).catch(err => { }).catch(err => {
this.update({ this.update({
wait: false wait: false
@ -265,7 +265,7 @@
this.cancel = () => { this.cancel = () => {
this.trigger('cancel'); this.trigger('cancel');
this.unmount(); this.$destroy();
}; };
this.kao = () => { this.kao = () => {