refactor: refactor dialogs (#1015)

src/routes/_components/dialog/creators/showAccountProfileOptionsDialog.js

@@ -1,18 +1,12 @@
 import AccountProfileOptionsDialog from '../components/AccountProfileOptionsDialog.html'
-import { createDialogElement } from '../helpers/createDialogElement'
+import { showDialog } from './showDialog'
-import { createDialogId } from '../helpers/createDialogId'
 
 export default function showAccountProfileOptionsDialog (account, relationship, verifyCredentials) {
-  let dialog = new AccountProfileOptionsDialog({
+  return showDialog(AccountProfileOptionsDialog, {
-    target: createDialogElement(),
-    data: {
-      id: createDialogId(),
     label: 'Profile options dialog',
     title: '',
     account: account,
     relationship: relationship,
     verifyCredentials: verifyCredentials
-    }
   })
-  dialog.show()
 }

src/routes/_components/dialog/creators/showComposeDialog.js

@@ -1,14 +1,6 @@
 import ComposeDialog from '../components/ComposeDialog.html'
-import { createDialogElement } from '../helpers/createDialogElement'
+import { showDialog } from './showDialog'
-import { createDialogId } from '../helpers/createDialogId'
 
 export default function showComposeDialog () {
-  let dialog = new ComposeDialog({
+  return showDialog(ComposeDialog, { label: 'Compose dialog' })
-    target: createDialogElement(),
-    data: {
-      id: createDialogId(),
-      label: 'Compose dialog'
-    }
-  })
-  dialog.show()
 }

src/routes/_components/dialog/creators/showCopyDialog.js

@@ -1,16 +1,10 @@
 import CopyDialog from '../components/CopyDialog.html'
-import { createDialogElement } from '../helpers/createDialogElement'
+import { showDialog } from './showDialog'
-import { createDialogId } from '../helpers/createDialogId'
 
 export default function showCopyDialog (text) {
-  let dialog = new CopyDialog({
+  return showDialog(CopyDialog, {
-    target: createDialogElement(),
-    data: {
-      id: createDialogId(),
     label: 'Copy dialog',
     title: 'Copy link',
     text
-    }
   })
-  dialog.show()
 }

src/routes/_components/dialog/creators/showDialog.js

@@ -0,0 +1,13 @@
+import { createDialogElement } from '../helpers/createDialogElement'
+import { createDialogId } from '../helpers/createDialogId'
+
+export function showDialog (Dialog, data) {
+  let dialog = new Dialog({
+    target: createDialogElement(),
+    data: Object.assign({
+      id: createDialogId()
+    }, data)
+  })
+  dialog.show()
+  return dialog
+}

src/routes/_components/dialog/creators/showEmojiDialog.js

@@ -1,16 +1,10 @@
 import EmojiDialog from '../components/EmojiDialog.html'
-import { createDialogElement } from '../helpers/createDialogElement'
+import { showDialog } from './showDialog'
-import { createDialogId } from '../helpers/createDialogId'
 
 export default function showEmojiDialog (realm) {
-  let emojiDialog = new EmojiDialog({
+  return showDialog(EmojiDialog, {
-    target: createDialogElement(),
-    data: {
-      id: createDialogId(),
     label: 'Emoji dialog',
     title: 'Emoji',
     realm
-    }
   })
-  emojiDialog.show()
 }

src/routes/_components/dialog/creators/showMediaDialog.js

@@ -1,16 +1,10 @@
 import MediaDialog from '../components/MediaDialog.html'
-import { createDialogElement } from '../helpers/createDialogElement'
+import { showDialog } from './showDialog'
-import { createDialogId } from '../helpers/createDialogId'
 
 export default function showMediaDialog (mediaItems, scrolledItem) {
-  let dialog = new MediaDialog({
+  return showDialog(MediaDialog, {
-    target: createDialogElement(),
-    data: {
-      id: createDialogId(),
     label: 'Media dialog',
     mediaItems,
     scrolledItem
-    }
   })
-  dialog.show()
 }

src/routes/_components/dialog/creators/showMuteDialog.js

@@ -1,16 +1,9 @@
 import MuteDialog from '../components/MuteDialog.html'
-import { createDialogElement } from '../helpers/createDialogElement'
+import { showDialog } from './showDialog'
-import { createDialogId } from '../helpers/createDialogId'
 
 export default function showMuteDialog (account) {
-  let dialog = new MuteDialog({
+  return showDialog(MuteDialog, {
-    target: createDialogElement(),
-    data: {
-      id: createDialogId(),
     label: 'Mute dialog',
     account
-    }
   })
-  dialog.show()
-  return dialog
 }

src/routes/_components/dialog/creators/showPostPrivacyDialog.js

@@ -1,16 +1,10 @@
 import PostPrivacyDialog from '../components/PostPrivacyDialog.html'
-import { createDialogElement } from '../helpers/createDialogElement'
+import { showDialog } from './showDialog'
-import { createDialogId } from '../helpers/createDialogId'
 
 export default function showPostPrivacyDialog (realm) {
-  let dialog = new PostPrivacyDialog({
+  return showDialog(PostPrivacyDialog, {
-    target: createDialogElement(),
-    data: {
-      id: createDialogId(),
     label: 'Post privacy dialog',
     title: 'Post privacy',
     realm: realm
-    }
   })
-  dialog.show()
 }

src/routes/_components/dialog/creators/showShortcutHelpDialog.js

@@ -1,14 +1,8 @@
 import ShortcutHelpDialog from '../components/ShortcutHelpDialog.html'
-import { createDialogElement } from '../helpers/createDialogElement'
+import { showDialog } from './showDialog'
-import { createDialogId } from '../helpers/createDialogId'
 
 export default function showShortcutHelpDialog (options) {
-  let dialog = new ShortcutHelpDialog({
+  return showDialog(ShortcutHelpDialog, Object.assign({
-    target: createDialogElement(),
-    data: Object.assign({
-      id: createDialogId(),
     label: 'shortcut help dialog'
-    }, options)
+  }, options))
-  })
-  dialog.show()
 }

src/routes/_components/dialog/creators/showStatusOptionsDialog.js

@@ -1,16 +1,10 @@
 import StatusOptionsDialog from '../components/StatusOptionsDialog.html'
-import { createDialogElement } from '../helpers/createDialogElement'
+import { showDialog } from './showDialog'
-import { createDialogId } from '../helpers/createDialogId'
 
 export default function showStatusOptionsDialog (status) {
-  let dialog = new StatusOptionsDialog({
+  return showDialog(StatusOptionsDialog, {
-    target: createDialogElement(),
-    data: {
-      id: createDialogId(),
     label: 'Status options dialog',
     title: '',
     status: status
-    }
   })
-  dialog.show()
 }

src/routes/_components/dialog/creators/showTextConfirmationDialog.js

@@ -1,15 +1,8 @@
 import TextConfirmationDialog from '../components/TextConfirmationDialog.html'
-import { createDialogElement } from '../helpers/createDialogElement'
+import { showDialog } from './showDialog'
-import { createDialogId } from '../helpers/createDialogId'
 
 export default function showTextConfirmationDialog (options) {
-  let dialog = new TextConfirmationDialog({
+  return showDialog(TextConfirmationDialog, Object.assign({
-    target: createDialogElement(),
-    data: Object.assign({
-      id: createDialogId(),
     label: 'Confirmation dialog'
-    }, options)
+  }, options))
-  })
-  dialog.show()
-  return dialog
 }