3021: Silence "invalid regexp" errors while typing regexp; put input in "has-error...
authorTom Clegg <tom@curoverse.com>
Sat, 3 Jan 2015 03:20:59 +0000 (22:20 -0500)
committerTom Clegg <tom@curoverse.com>
Sat, 3 Jan 2015 03:21:45 +0000 (22:21 -0500)
apps/workbench/app/assets/javascripts/filterable.js

index cd01f64a74f539945d5fb2f0f7cef7399a574be3..34075ca56c3c0f684a353f72b1bbbd9a480ced66 100644 (file)
@@ -83,6 +83,7 @@ $(document).
         });
     }).
     on('paste keyup input', 'input[type=text].filterable-control', function(e) {
+        var regexp;
         if (this != e.target) return;
         var $target = $($(this).attr('data-filterable-target'));
         var currentquery = $target.data('filterable-query');
@@ -113,9 +114,20 @@ $(document).
         } else {
             // Target does not have infinite-scroll capability. Just
             // filter the rows in the browser using a RegExp.
+            regexp = undefined;
+            try {
+                regexp = new RegExp($(this).val(), 'i');
+            } catch(e) {
+                if (e instanceof SyntaxError) {
+                    // Invalid/partial regexp. See 'has-error' below.
+                } else {
+                    throw e;
+                }
+            }
             $target.
+                toggleClass('has-error', regexp === undefined).
                 addClass('filterable-container').
-                data('q', new RegExp($(this).val(), 'i')).
+                data('q', regexp).
                 trigger('refresh');
         }
     }).on('refresh', '.filterable-container', function() {