From 8ba621795abe70cdce207c2c47499b24ead4c91b Mon Sep 17 00:00:00 2001 From: TheHollidayInn Date: Thu, 25 Jun 2015 22:30:47 -0500 Subject: [PATCH] Task filter now searches checklists --- test/spec/filters/taskOrderingSpec.js | 9 +++++++++ website/public/js/filters/taskOrdering.js | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/test/spec/filters/taskOrderingSpec.js b/test/spec/filters/taskOrderingSpec.js index 46a9162c49..27c1e461cb 100644 --- a/test/spec/filters/taskOrderingSpec.js +++ b/test/spec/filters/taskOrderingSpec.js @@ -51,5 +51,14 @@ describe('Task Ordering Filters', function() { expect(filter('filterByTextAndNotes')(tasks, 'bar')).to.eql([tasks[1]]); expect(filter('filterByTextAndNotes')(tasks, 'foo')).to.eql([tasks[0], tasks[1]]); }); + + it('filters items by checklists', function () { + var tasks = [ + { text: 'foo' }, + { text: 'foo', notes: 'bar', checklist: [ {text: "checkListToFind"} ] } + ]; + + expect(filter('filterByTextAndNotes')(tasks, 'checkListToFind')).to.eql([tasks[1]]); + }); }); }); diff --git a/website/public/js/filters/taskOrdering.js b/website/public/js/filters/taskOrdering.js index 42abd471c0..7c1f346f7f 100644 --- a/website/public/js/filters/taskOrdering.js +++ b/website/public/js/filters/taskOrdering.js @@ -22,6 +22,13 @@ angular.module('habitrpg') for (var i = 0; i < input.length; i++) { if (term.test(input[i].text) || term.test(input[i].notes)) { result.push(input[i]); + }else if (input[i].checklist) { + var checkListLen = input[i].checklist.length; + for (var j = 0; j < checkListLen; j++) { + if ( term.test(input[i].checklist[j].text) ) { + result.push(input[i]); + } + } } }