From 16fee0335f2b10b0ce54f71965d2f2acc0e24942 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 9 May 2018 23:22:52 +0900
Subject: Show card modal on public pages (#7428)
---
app/javascript/packs/public.js | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
(limited to 'app/javascript/packs')
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 7096b9b4f..3a1f1a16b 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -25,7 +25,6 @@ function main() {
const { getLocale } = require('../mastodon/locales');
const { localeData } = getLocale();
const VideoContainer = require('../mastodon/containers/video_container').default;
- const CardContainer = require('../mastodon/containers/card_container').default;
const React = require('react');
const ReactDOM = require('react-dom');
@@ -75,10 +74,16 @@ function main() {
ReactDOM.render(<VideoContainer locale={locale} {...props} />, content);
});
- [].forEach.call(document.querySelectorAll('[data-component="Card"]'), (content) => {
- const props = JSON.parse(content.getAttribute('data-props'));
- ReactDOM.render(<CardContainer locale={locale} {...props} />, content);
- });
+ const cards = document.querySelectorAll('[data-component="Card"]');
+
+ if (cards.length > 0) {
+ import(/* webpackChunkName: "containers/cards_container" */ '../mastodon/containers/cards_container').then(({ default: CardsContainer }) => {
+ const content = document.createElement('div');
+
+ ReactDOM.render(<CardsContainer locale={locale} cards={cards} />, content);
+ document.body.appendChild(content);
+ }).catch(error => console.error(error));
+ }
const mediaGalleries = document.querySelectorAll('[data-component="MediaGallery"]');
--
cgit