From fa1a85f682302c3629326198b3cb5ecf738d3cd7 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 27 May 2018 18:12:39 +0900
Subject: [PATCH] Fix bug

---
 src/client/app/desktop/api/contextmenu.ts | 17 ++++++++---------
 src/client/app/desktop/api/dialog.ts      | 17 ++++++++---------
 src/client/app/desktop/api/input.ts       | 21 ++++++++++-----------
 src/client/app/desktop/api/notify.ts      | 13 ++++++-------
 src/client/app/desktop/api/post.ts        | 21 +++++++++------------
 src/client/app/desktop/script.ts          |  8 ++++----
 6 files changed, 45 insertions(+), 52 deletions(-)

diff --git a/src/client/app/desktop/api/contextmenu.ts b/src/client/app/desktop/api/contextmenu.ts
index b70d7122d..c92f08755 100644
--- a/src/client/app/desktop/api/contextmenu.ts
+++ b/src/client/app/desktop/api/contextmenu.ts
@@ -1,16 +1,15 @@
+import OS from '../../mios';
 import Ctx from '../views/components/context-menu.vue';
 
-export default function(e, menu, opts?) {
+export default (os: OS) => (e, menu, opts?) => {
 	const o = opts || {};
-	const vm = new Ctx({
-		propsData: {
-			menu,
-			x: e.pageX - window.pageXOffset,
-			y: e.pageY - window.pageYOffset,
-		}
-	}).$mount();
+	const vm = os.new(Ctx, {
+		menu,
+		x: e.pageX - window.pageXOffset,
+		y: e.pageY - window.pageYOffset,
+	});
 	vm.$once('closed', () => {
 		if (o.closed) o.closed();
 	});
 	document.body.appendChild(vm.$el);
-}
+};
diff --git a/src/client/app/desktop/api/dialog.ts b/src/client/app/desktop/api/dialog.ts
index 07935485b..32785cf82 100644
--- a/src/client/app/desktop/api/dialog.ts
+++ b/src/client/app/desktop/api/dialog.ts
@@ -1,16 +1,15 @@
+import OS from '../../mios';
 import Dialog from '../views/components/dialog.vue';
 
-export default function(opts) {
+export default (os: OS) => opts => {
 	return new Promise<string>((res, rej) => {
 		const o = opts || {};
-		const d = new Dialog({
-			propsData: {
-				title: o.title,
-				text: o.text,
-				modal: o.modal,
-				buttons: o.actions
-			}
-		}).$mount();
+		const d = os.new(Dialog, {
+			title: o.title,
+			text: o.text,
+			modal: o.modal,
+			buttons: o.actions
+		});
 		d.$once('clicked', id => {
 			res(id);
 		});
diff --git a/src/client/app/desktop/api/input.ts b/src/client/app/desktop/api/input.ts
index ce26a8112..bd7bfa012 100644
--- a/src/client/app/desktop/api/input.ts
+++ b/src/client/app/desktop/api/input.ts
@@ -1,20 +1,19 @@
+import OS from '../../mios';
 import InputDialog from '../views/components/input-dialog.vue';
 
-export default function(opts) {
+export default (os: OS) => opts => {
 	return new Promise<string>((res, rej) => {
 		const o = opts || {};
-		const d = new InputDialog({
-			propsData: {
-				title: o.title,
-				placeholder: o.placeholder,
-				default: o.default,
-				type: o.type || 'text',
-				allowEmpty: o.allowEmpty
-			}
-		}).$mount();
+		const d = os.new(InputDialog, {
+			title: o.title,
+			placeholder: o.placeholder,
+			default: o.default,
+			type: o.type || 'text',
+			allowEmpty: o.allowEmpty
+		});
 		d.$once('done', text => {
 			res(text);
 		});
 		document.body.appendChild(d.$el);
 	});
-}
+};
diff --git a/src/client/app/desktop/api/notify.ts b/src/client/app/desktop/api/notify.ts
index 1f89f40ce..72e582760 100644
--- a/src/client/app/desktop/api/notify.ts
+++ b/src/client/app/desktop/api/notify.ts
@@ -1,10 +1,9 @@
+import OS from '../../mios';
 import Notification from '../views/components/ui-notification.vue';
 
-export default function(message) {
-	const vm = new Notification({
-		propsData: {
-			message
-		}
-	}).$mount();
+export default (os: OS) => message => {
+	const vm = os.new(Notification, {
+		message
+	});
 	document.body.appendChild(vm.$el);
-}
+};
diff --git a/src/client/app/desktop/api/post.ts b/src/client/app/desktop/api/post.ts
index b569610e1..af71829c7 100644
--- a/src/client/app/desktop/api/post.ts
+++ b/src/client/app/desktop/api/post.ts
@@ -1,21 +1,18 @@
+import OS from '../../mios';
 import PostFormWindow from '../views/components/post-form-window.vue';
 import RenoteFormWindow from '../views/components/renote-form-window.vue';
 
-export default function(opts) {
+export default (os: OS) => opts => {
 	const o = opts || {};
 	if (o.renote) {
-		const vm = new RenoteFormWindow({
-			propsData: {
-				renote: o.renote
-			}
-		}).$mount();
+		const vm = os.new(RenoteFormWindow, {
+			renote: o.renote
+		});
 		document.body.appendChild(vm.$el);
 	} else {
-		const vm = new PostFormWindow({
-			propsData: {
-				reply: o.reply
-			}
-		}).$mount();
+		const vm = os.new(PostFormWindow, {
+			reply: o.reply
+		});
 		document.body.appendChild(vm.$el);
 	}
-}
+};
diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts
index 09a9257ea..8fb6096af 100644
--- a/src/client/app/desktop/script.ts
+++ b/src/client/app/desktop/script.ts
@@ -69,10 +69,10 @@ init(async (launch) => {
 	const [, os] = launch(router, os => ({
 		chooseDriveFolder: chooseDriveFolder(os),
 		chooseDriveFile: chooseDriveFile(os),
-		dialog,
-		input,
-		post,
-		notify,
+		dialog: dialog(os),
+		input: input(os),
+		post: post(os),
+		notify: notify(os),
 		updateAvatar: updateAvatar(os),
 		updateBanner: updateBanner(os)
 	}));