Merge pull request #2101 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

2 files changed, 4 insertions, 2 deletions

diff --git a/app/javascript/core/embed.js b/app/javascript/core/embed.js
index 9083eb7a3..d1e8f6b10 100644
--- a/app/javascript/core/embed.js
+++ b/app/javascript/core/embed.js
@@ -15,7 +15,7 @@ window.addEventListener('message', e => {
       id: data.id,
       height: document.getElementsByTagName('html')[0].scrollHeight,
     }, '*');
-  };
+  }
 
   if (['interactive', 'complete'].includes(document.readyState)) {
     setEmbedHeight();
diff --git a/app/javascript/core/settings.js b/app/javascript/core/settings.js
index d5bb9532c..d578463a3 100644
--- a/app/javascript/core/settings.js
+++ b/app/javascript/core/settings.js
@@ -2,7 +2,9 @@
 
 import 'packs/public-path';
 import escapeTextContentForBrowser from 'escape-html';
+
 const { delegate } = require('@rails/ujs');
+
 import emojify from '../mastodon/features/emoji/emoji';
 
 delegate(document, '#account_display_name', 'input', ({ target }) => {
@@ -65,7 +67,7 @@ delegate(document, '.input-copy button', 'click', ({ target }) => {
       input.blur();
       target.parentNode.classList.add('copied');
 
-    setTimeout(() => {
+      setTimeout(() => {
         target.parentNode.classList.remove('copied');
       }, 700);
     }