Merge pull request #147 from will-moore/improve_file_filter

Improve file filter
ome · Apr 14, 2016 · 6f8a598 · 6f8a598
2 parents 7b52b85 + e2193d7
commit 6f8a598
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ To concatenate js files into a single figure.js file that is used in the app:
 
     $ grunt concat
 
-During development, you'll want to have both of these run whenever the relevant are edited.
+During development, you'll want to have both of these run whenever the relevant files are edited.
 This can be achieved with:
 
 	$ grunt watch

diff --git a/static/figure/figure.js b/static/figure/figure.js
@@ -3074,9 +3074,13 @@ var FigureFile = Backbone.Model.extend({
             }
         }
         if (filter.name) {
-            if (this.get('name').toLowerCase().indexOf(filter.name) < 0) {
-                return false;
-            }
+            // Search for files that have all words in
+            var name = this.get('name').toLowerCase();
+            var words = $.trim(filter.name).split(" ");
+            var visible = words.reduce(function(prev, t){
+                return prev && name.indexOf(t) > -1
+            }, true);
+            return visible;
         }
         return true;
     }

diff --git a/static/figure/js/views/files.js b/static/figure/js/views/files.js
@@ -43,9 +43,13 @@ var FigureFile = Backbone.Model.extend({
             }
         }
         if (filter.name) {
-            if (this.get('name').toLowerCase().indexOf(filter.name) < 0) {
-                return false;
-            }
+            // Search for files that have all words in
+            var name = this.get('name').toLowerCase();
+            var words = $.trim(filter.name).split(" ");
+            var visible = words.reduce(function(prev, t){
+                return prev && name.indexOf(t) > -1
+            }, true);
+            return visible;
         }
         return true;
     }