diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-11 00:28:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-11 00:28:10 +0200 |
commit | 72698bc3b49925a2b2955f32e5a562c1eecd729b (patch) | |
tree | 747cf619113cc7377a4e48eaf504892b45a2696f /app/javascript/packs | |
parent | 65027657ec5595131bfd82fce1458c9e2cd1afc6 (diff) |
Fix regressions from #2683 (#2970)
* Fix regressions from #2683 Properly format spoiler text HTML, while keeping old logic for blankness intact Process hashtags and mentions in spoiler text Format spoiler text for Atom Change "show more" toggle into a button instead of anchor Fix style regression on dropdowns for detailed statuses * Fix lint issue * Convert spoiler text to plaintext in desktop notifications
Diffstat (limited to 'app/javascript/packs')
-rw-r--r-- | app/javascript/packs/public.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js index 6aef2ffee..bbeb0a9ec 100644 --- a/app/javascript/packs/public.js +++ b/app/javascript/packs/public.js @@ -3,9 +3,12 @@ import { length } from 'stringz'; import { default as dateFormat } from 'date-fns/format'; import distanceInWordsStrict from 'date-fns/distance_in_words_strict'; import { delegate } from 'rails-ujs'; +import Rails from 'rails-ujs'; require.context('../images/', true); +Rails.start(); + const parseFormat = (format) => format.replace(/%(\w)/g, (_, modifier) => { switch (modifier) { case '%': |