about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-05-18 00:38:18 +0200
committerGitHub <noreply@github.com>2017-05-18 00:38:18 +0200
commit76449df903de5b06ae22745a1a80ecf49a07e0d9 (patch)
tree9fe48eb48b81187f9ca38bfc08f247e8d55951c2
parent226c9836e464b3066015799c7572cd8ff3758968 (diff)
Fix character counter not updating for bio (#3101)
-rw-r--r--app/javascript/packs/public.js2
-rw-r--r--app/views/settings/profiles/show.html.haml4
-rw-r--r--config/locales/simple_form.en.yml12
3 files changed, 9 insertions, 9 deletions
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 6aef2ffee..e392bad18 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -101,7 +101,7 @@ document.addEventListener('DOMContentLoaded', () => {
   });
 
   delegate(document, '.account_note', 'input', ({ target }) => {
-    const [noteCounter, ] = document.getElementsByClassName('.note-counter');
+    const [noteCounter, ] = document.getElementsByClassName('note-counter');
     noteCounter.textContent = 160 - length(target.value);
   });
 });
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index cce2d59f7..2b846006f 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -5,8 +5,8 @@
   = render 'shared/error_messages', object: @account
 
   .fields-group
-    = f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name'), hint: t('simple_form.hints.defaults.display_name', count: "<span class=\"name-counter\">#{30 - @account.display_name.size}</span>").html_safe
-    = f.input :note, placeholder: t('simple_form.labels.defaults.note'), hint: t('simple_form.hints.defaults.note', count: "<span class=\"note-counter\">#{160 - @account.note.size}</span>").html_safe
+    = f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name'), hint: t('simple_form.hints.defaults.display_name', count: 30 - @account.display_name.size).html_safe
+    = f.input :note, placeholder: t('simple_form.labels.defaults.note'), hint: t('simple_form.hints.defaults.note', count: 160 - @account.note.size).html_safe
     = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar')
     = f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header')
 
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 8319d921d..74dc16efe 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -4,14 +4,14 @@ en:
     hints:
       defaults:
         avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 120x120px
-        display_name: 
-            one: '1 character left'
-            other: '%{count} characters left'
+        display_name:
+            one: '<span class="name-counter">1</span> character left'
+            other: '<span class="name-counter">%{count}</span> characters left'
         header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px
         locked: Requires you to manually approve followers and defaults post privacy to followers-only
-        note: 
-            one: '1 character left'
-            other: '%{count} characters left'
+        note:
+            one: '<span class="note-counter">1</span> character left'
+            other: '<span class="note-counter">%{count}</span> characters left'
       imports:
         data: CSV file exported from another Mastodon instance
       sessions: