Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).
		
			
				
	
	
		
			85 lines
		
	
	
	
		
			3.1 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
			
		
		
	
	
			85 lines
		
	
	
	
		
			3.1 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
import loadPolyfills from '../mastodon/load_polyfills';
 | 
						|
import ready from '../mastodon/ready';
 | 
						|
import { start } from '../mastodon/common';
 | 
						|
 | 
						|
start();
 | 
						|
 | 
						|
function main() {
 | 
						|
  const IntlMessageFormat = require('intl-messageformat').default;
 | 
						|
  const { timeAgoString } = require('../mastodon/components/relative_timestamp');
 | 
						|
  const { delegate } = require('rails-ujs');
 | 
						|
  const emojify = require('../mastodon/features/emoji/emoji').default;
 | 
						|
  const { getLocale } = require('../mastodon/locales');
 | 
						|
  const { messages } = getLocale();
 | 
						|
  const React = require('react');
 | 
						|
  const ReactDOM = require('react-dom');
 | 
						|
  const Rellax = require('rellax');
 | 
						|
  const createHistory = require('history').createBrowserHistory;
 | 
						|
 | 
						|
  ready(() => {
 | 
						|
    const locale = document.documentElement.lang;
 | 
						|
 | 
						|
    const dateTimeFormat = new Intl.DateTimeFormat(locale, {
 | 
						|
      year: 'numeric',
 | 
						|
      month: 'long',
 | 
						|
      day: 'numeric',
 | 
						|
      hour: 'numeric',
 | 
						|
      minute: 'numeric',
 | 
						|
    });
 | 
						|
 | 
						|
    [].forEach.call(document.querySelectorAll('.emojify'), (content) => {
 | 
						|
      content.innerHTML = emojify(content.innerHTML);
 | 
						|
    });
 | 
						|
 | 
						|
    [].forEach.call(document.querySelectorAll('time.formatted'), (content) => {
 | 
						|
      const datetime = new Date(content.getAttribute('datetime'));
 | 
						|
      const formattedDate = dateTimeFormat.format(datetime);
 | 
						|
 | 
						|
      content.title = formattedDate;
 | 
						|
      content.textContent = formattedDate;
 | 
						|
    });
 | 
						|
 | 
						|
    [].forEach.call(document.querySelectorAll('time.time-ago'), (content) => {
 | 
						|
      const datetime = new Date(content.getAttribute('datetime'));
 | 
						|
      const now      = new Date();
 | 
						|
 | 
						|
      content.title = dateTimeFormat.format(datetime);
 | 
						|
      content.textContent = timeAgoString({
 | 
						|
        formatMessage: ({ id, defaultMessage }, values) => (new IntlMessageFormat(messages[id] || defaultMessage, locale)).format(values),
 | 
						|
        formatDate: (date, options) => (new Intl.DateTimeFormat(locale, options)).format(date),
 | 
						|
      }, datetime, now, now.getFullYear());
 | 
						|
    });
 | 
						|
 | 
						|
    const reactComponents = document.querySelectorAll('[data-component]');
 | 
						|
 | 
						|
    if (reactComponents.length > 0) {
 | 
						|
      import(/* webpackChunkName: "containers/media_container" */ '../mastodon/containers/media_container')
 | 
						|
        .then(({ default: MediaContainer }) => {
 | 
						|
          const content = document.createElement('div');
 | 
						|
 | 
						|
          ReactDOM.render(<MediaContainer locale={locale} components={reactComponents} />, content);
 | 
						|
          document.body.appendChild(content);
 | 
						|
        })
 | 
						|
        .catch(error => console.error(error));
 | 
						|
    }
 | 
						|
 | 
						|
    const parallaxComponents = document.querySelectorAll('.parallax');
 | 
						|
 | 
						|
    if (parallaxComponents.length > 0 ) {
 | 
						|
      new Rellax('.parallax', { speed: -1 });
 | 
						|
    }
 | 
						|
 | 
						|
    const history = createHistory();
 | 
						|
    const detailedStatuses = document.querySelectorAll('.public-layout .detailed-status');
 | 
						|
    const location = history.location;
 | 
						|
 | 
						|
    if (detailedStatuses.length === 1 && (!location.state || !location.state.scrolledToDetailedStatus)) {
 | 
						|
      detailedStatuses[0].scrollIntoView();
 | 
						|
      history.replace(location.pathname, { ...location.state, scrolledToDetailedStatus: true });
 | 
						|
    }
 | 
						|
  });
 | 
						|
}
 | 
						|
 | 
						|
loadPolyfills().then(main).catch(error => {
 | 
						|
  console.error(error);
 | 
						|
});
 |