From 6feafb8802b2759eb33968a70b6c1cb100bf3926 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 20 Jan 2020 15:55:03 +0100
Subject: Various fixes and improvements (#12878)

* Fix unused role routes being generated

* Remove unused JavaScript code

* Refactor filters code to be DRYer

* Fix `.count == 0` comparisons to `.empty?` in views

* Fix filters in views
---
 app/javascript/packs/public.js | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'app/javascript')

diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 6a7f8831d..9bc6214af 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -142,15 +142,6 @@ function main() {
     return false;
   });
 
-  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, '.modal-button', 'click', e => {
     e.preventDefault();
 
-- 
cgit 


From 2d5addde03563b03b59e9125cdc46143a13e9566 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Mon, 20 Jan 2020 16:34:42 +0100
Subject: Fix “X new items” not showing up for slow mode on empty timelines
 (#12875)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/mastodon/components/scrollable_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/javascript')

diff --git a/app/javascript/mastodon/components/scrollable_list.js b/app/javascript/mastodon/components/scrollable_list.js
index 47a87b149..3a490e78e 100644
--- a/app/javascript/mastodon/components/scrollable_list.js
+++ b/app/javascript/mastodon/components/scrollable_list.js
@@ -296,7 +296,7 @@ export default class ScrollableList extends PureComponent {
           </div>
         </div>
       );
-    } else if (isLoading || childrenCount > 0 || hasMore || !emptyMessage) {
+    } else if (isLoading || childrenCount > 0 || numPending > 0 || hasMore || !emptyMessage) {
       scrollableArea = (
         <div className={classNames('scrollable', { fullscreen })} ref={this.setRef} onMouseMove={this.handleMouseMove}>
           <div role='feed' className='item-list'>
-- 
cgit