about summary refs log tree commit diff
path: root/app/javascript/core
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-06-10 18:30:41 +0200
committerThibaut Girka <thib@sitedethib.com>2019-06-10 18:59:53 +0200
commit1b0ff4cd69b00f0d2613be45cc233e25dc1a0d05 (patch)
tree1b67879adb426809f3e00102fc2f97a8118b011e /app/javascript/core
parentb45f555a0c7a7d50ed7640b938eb8b5a671a0e10 (diff)
parent8514ef723c3e3963567a9d57bd0d71a5091fc802 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
Diffstat (limited to 'app/javascript/core')
-rw-r--r--app/javascript/core/public.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/javascript/core/public.js b/app/javascript/core/public.js
index 4be75647a..33b7a207d 100644
--- a/app/javascript/core/public.js
+++ b/app/javascript/core/public.js
@@ -14,15 +14,15 @@ delegate(document, '.webapp-btn', 'click', ({ target, button }) => {
   return false;
 });
 
-delegate(document, '.status__content__spoiler-link', 'click', ({ target }) => {
-  const contentEl = target.parentNode.parentNode.querySelector('.e-content');
+delegate(document, '.status__content__spoiler-link', 'click', function() {
+  const contentEl = this.parentNode.parentNode.querySelector('.e-content');
 
   if (contentEl.style.display === 'block') {
     contentEl.style.display = 'none';
-    target.parentNode.style.marginBottom = 0;
+    this.parentNode.style.marginBottom = 0;
   } else {
     contentEl.style.display = 'block';
-    target.parentNode.style.marginBottom = null;
+    this.parentNode.style.marginBottom = null;
   }
 
   return false;