Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '899eac1a92c802c334606a49d538ef37bd47c91a' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Changes split in `app/javascript/core/admin.js` and `app/javascript/flavours/glitch/packs/admin.jsx`.
This commit is contained in:
Claire
2024-02-28 20:10:01 +01:00
parent c19787f3f4 899eac1a92
commit c2f0ea415e
10 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/embed.js
View File

@@ -31,6 +31,8 @@
var iframe = iframes.get(data.id);
if(!iframe) return;
if ('source' in e && iframe.contentWindow !== e.source) {
return;
}
@@ -38,7 +40,7 @@
iframe.height = data.height;
});
[].forEach.call(document.querySelectorAll('iframe.mastodon-embed'), function (iframe) {
document.querySelectorAll('iframe.mastodon-embed').forEach(iframe => {
// select unique id for each iframe
var id = 0, failCount = 0, idBuffer = new Uint32Array(1);
while (id === 0 || iframes.has(id)) {