From 7dd9b0dd3c385f5f5d10f90d81aab2c573429bd1 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 8 Aug 2016 14:49:51 +0100
Subject: [PATCH] Resets the page & the scrolling when filters are updated

---
 .../javascripts/boards/components/board.js.es6     |  1 +
 .../boards/components/board_list.js.es6            | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/boards/components/board.js.es6 b/app/assets/javascripts/boards/components/board.js.es6
index ff9bffafd99..aa4311f6742 100644
--- a/app/assets/javascripts/boards/components/board.js.es6
+++ b/app/assets/javascripts/boards/components/board.js.es6
@@ -19,6 +19,7 @@
       },
       'filters': {
         handler: function () {
+          this.list.page = 1;
           this.list.getIssues(true);
         },
         deep: true
diff --git a/app/assets/javascripts/boards/components/board_list.js.es6 b/app/assets/javascripts/boards/components/board_list.js.es6
index cc856aba029..7d0cca6a88a 100644
--- a/app/assets/javascripts/boards/components/board_list.js.es6
+++ b/app/assets/javascripts/boards/components/board_list.js.es6
@@ -10,9 +10,19 @@
     data: function () {
       return {
         scrollOffset: 250,
-        loadingMore: false
+        loadingMore: false,
+        filters: BoardsStore.state.filters
       };
     },
+    watch: {
+      'filters': {
+        handler: function () {
+          this.loadingMore = false;
+          this.$els.list.scrollTop = 0;
+        },
+        deep: true
+      }
+    },
     methods: {
       listHeight: function () {
         return this.$els.list.getBoundingClientRect().height;
@@ -46,7 +56,7 @@
 
           // Remove the new dom element & let vue add the element
           e.item.parentNode.removeChild(e.item);
-          
+
           BoardsStore.moveCardToList(fromListId, toListId, issueId);
         }
       }, gl.boardSortableDefaultOptions);
-- 
GitLab