Merge branch '9005-share-discovery'

[arvados.git] / apps / workbench / app / assets / javascripts / filterable.js

diff --git a/apps/workbench/app/assets/javascripts/filterable.js b/apps/workbench/app/assets/javascripts/filterable.js
index cd01f64a74f539945d5fb2f0f7cef7399a574be3..e3639d0f2bdefea6d72da8b0fd6cd34bbe47f4c2 100644 (file)
--- a/apps/workbench/app/assets/javascripts/filterable.js
+++ b/apps/workbench/app/assets/javascripts/filterable.js
@@ -52,7 +52,12 @@
 function updateFilterableQueryNow($target) {
     var newquery = $target.data('filterable-query-new');
     var params = $target.data('infinite-content-params-filterable') || {};
-    params.filters = [['any', 'ilike', '%' + newquery + '%']];
+    if (newquery == null || newquery == '') {
+      params.filters = [];
+    } else {
+      params.filters = [['any', '@@', newquery.trim().concat(':*')]];
+    }
+    $(".modal-dialog-preview-pane").html("");
     $target.data('infinite-content-params-filterable', params);
     $target.data('filterable-query', newquery);
 }
@@ -83,6 +88,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 +119,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() {