diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 18:31:11 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 18:31:11 +0100 |
| commit | dc2ab6e646bb721ef2e1be268b876bd00e8fa802 (patch) | |
| tree | a828f3968b151924656061bfc709b00565aff877 /app/javascript/flavours/glitch | |
| parent | eeb8753adc98022a55051d45a137b02a2bff4c23 (diff) | |
| parent | 02063c245c8a2a09e741cbce8302edf3ec14feef (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/packs/public.js`: Upstream removed an unused function in code that has been refactored a bit. Removed that function in the corresponding places.
Diffstat (limited to 'app/javascript/flavours/glitch')
| -rw-r--r-- | app/javascript/flavours/glitch/packs/public.js | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/app/javascript/flavours/glitch/packs/public.js b/app/javascript/flavours/glitch/packs/public.js index 973d6ee46..d1adfb17a 100644 --- a/app/javascript/flavours/glitch/packs/public.js +++ b/app/javascript/flavours/glitch/packs/public.js @@ -97,15 +97,6 @@ function main() { delegate(document, '.custom-emoji', 'mouseover', getEmojiAnimationHandler('data-original')); delegate(document, '.custom-emoji', 'mouseout', getEmojiAnimationHandler('data-static')); - - delegate(document, '.blocks-table button.icon-button', 'click', function(e) { - e.preventDefault(); - - const classList = this.firstElementChild.classList; - classList.toggle('fa-chevron-down'); - classList.toggle('fa-chevron-up'); - this.parentElement.parentElement.nextElementSibling.classList.toggle('hidden'); - }); }); delegate(document, '.sidebar__toggle__icon', 'click', () => { |