aboutsummaryrefslogtreecommitdiff
path: root/src/main.js
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2019-01-30 18:58:08 +0000
committerlambda <pleromagit@rogerbraun.net>2019-01-30 18:58:08 +0000
commit5b7b1dfebc37bd5db4e839973062b452b02c898d (patch)
treea517e4942725286b173b685cbe87bc6c7878b66e /src/main.js
parentb1facdf7ad54436c2afde7c28c917cda87a5b7e3 (diff)
parentc7cffbb6c70bbb21cf787d96e82e0261427b9234 (diff)
Merge branch 'feat/media-modal' into 'develop'
modal for viewing attachments in-tab See merge request pleroma/pleroma-fe!468
Diffstat (limited to 'src/main.js')
-rw-r--r--src/main.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main.js b/src/main.js
index f87ef9da..adeb0550 100644
--- a/src/main.js
+++ b/src/main.js
@@ -10,6 +10,7 @@ import apiModule from './modules/api.js'
import configModule from './modules/config.js'
import chatModule from './modules/chat.js'
import oauthModule from './modules/oauth.js'
+import mediaViewerModule from './modules/media_viewer.js'
import VueTimeago from 'vue-timeago'
import VueI18n from 'vue-i18n'
@@ -62,7 +63,8 @@ createPersistedState(persistedStateOptions).then((persistedState) => {
api: apiModule,
config: configModule,
chat: chatModule,
- oauth: oauthModule
+ oauth: oauthModule,
+ mediaViewer: mediaViewerModule
},
plugins: [persistedState, pushNotifications],
strict: false // Socket modifies itself, let's ignore this for now.