Merge branch 'master' into develop

src/app/filters.coffee

@@ -19,6 +19,9 @@ module.exports.app = (appExports, model) ->
     model.set '_editingTags', !before, ->
       location.reload() if before is true #when they're done, refresh the page
 
+  appExports.clearFilters = ->
+    user.set 'filters', {}
+
   appExports.filtersDeleteTag = (e, el) ->
     tags = user.get('tags')
     tagId = $(el).attr('data-tag-id')

src/app/helpers.coffee

@@ -202,6 +202,10 @@ viewHelpers = (view) ->
       arr.push(t.name) if taskTags?[t.id]
     arr.join(', ')
 
+#  view.fn 'activeFilters', (filters) ->
+#    debugger
+#    (_.find filters, (f) -> f)?
+
 
 
 module.exports = { viewHelpers, removeWhitespace, randomVal, daysBetween, dayMapping, username }

views/app/filters.html

@@ -29,6 +29,10 @@
               </form>
           {/}
       </li>
+      <!--<li class="{#unless activeFilters(_user.filters)}hidden{/}">-->
+      <li>
+          <a rel=tooltip title='Clear Filters' x-bind="click:clearFilters"><i class='icon-remove-sign'></i></a>
+      </li>
     </ul>
   </div>