Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge upstream (#81)

Browse source
This commit is contained in:
kibigo! 2017-07-15 14:33:15 -07:00
commit 09cfc079b0
213 changed files with 2714 additions and 1364 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,9 +5,7 @@ import emojify from '../mastodon/emoji';
import { getLocale } from '../mastodon/locales';
import loadPolyfills from '../mastodon/load_polyfills';
import { processBio } from '../glitch/util/bio_metadata';
import TimelineContainer from '../mastodon/containers/timeline_container';
import React from 'react';
import ReactDOM from 'react-dom';
import ready from '../mastodon/ready';
require.context('../images/', true);
@ -40,21 +38,10 @@ function loaded() {
const datetime = new Date(content.getAttribute('datetime'));
content.textContent = relativeFormat.format(datetime);;
});
const mountNode = document.getElementById('mastodon-timeline');
if (mountNode !== null) {
const props = JSON.parse(mountNode.getAttribute('data-props'));
ReactDOM.render(<TimelineContainer {...props} />, mountNode);
}
}
function main() {
if (['interactive', 'complete'].includes(document.readyState)) {
loaded();
} else {
document.addEventListener('DOMContentLoaded', loaded);
}
ready(loaded);
delegate(document, '.video-player video', 'click', ({ target }) => {
if (target.paused) {