Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'master' into glitch-soc/master

Browse source 
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
This commit is contained in:
Thibaut Girka 2018-05-09 17:43:30 +02:00
commit 1c9c0167b7
145 changed files with 3052 additions and 803 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/javascript/packs/public.js
View file

@ -7,7 +7,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');
@ -57,10 +56,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"]');