From abb55af272beafd71fd69400be3dbd1a16d81654 Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 15 Aug 2016 09:41:06 +0100
Subject: Fixed blank state issue Updated some parts based on feedback

---
 app/assets/javascripts/boards/components/board.js.es6 | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'app/assets/javascripts/boards/components/board.js.es6')

diff --git a/app/assets/javascripts/boards/components/board.js.es6 b/app/assets/javascripts/boards/components/board.js.es6
index f402206ca00..79727b96874 100644
--- a/app/assets/javascripts/boards/components/board.js.es6
+++ b/app/assets/javascripts/boards/components/board.js.es6
@@ -31,9 +31,11 @@
         this.query = '';
       },
       getFilterData () {
+        if (!this.list.canSearch()) return this.filters;
+
         const filters = this.filters;
-        let queryData = this.list.canSearch() ? { search: this.query } : {};
-        
+        let queryData = { search: this.query };
+
         Object.keys(filters).forEach((key) => { queryData[key] = filters[key]; });
 
         return queryData;
@@ -41,7 +43,7 @@
     },
     computed: {
       isPreset () {
-        return this.list.type === 'backlog' || this.list.type === 'done' || this.list.type === 'blank';
+        return ['backlog', 'done', 'blank'].indexOf(this.list.type) > -1;
       }
     },
     ready () {
@@ -59,7 +61,10 @@
         options.handle = '.js-board-drag-handle';
       }
 
-      Sortable.create(this.$el.parentNode, options);
+      this.sortable = Sortable.create(this.$el.parentNode, options);
+    },
+    beforeDestroy () {
+      this.sortable.destroy();
     }
   });
 
-- 
cgit v1.2.1