tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
- `app/javascript/packs/public.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
This commit is contained in:
Claire
2023-05-09 22:12:05 +02:00
parent 887112a065 c8181eb0a4
commit c81d1b0d38
144 changed files with 266 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/packs/admin.jsx
View File

@ -1,10 +1,9 @@
import './public-path';
import ready from '../mastodon/ready';
import React from 'react';
import ReactDOM from 'react-dom';
ready(() => {
const React = require('react');
const ReactDOM = require('react-dom');
[].forEach.call(document.querySelectorAll('[data-admin-component]'), element => {
const componentName = element.getAttribute('data-admin-component');
const { locale, ...componentProps } = JSON.parse(element.getAttribute('data-props'));