client: fix completer regression breaking search completion. Fixes #354

At the same time lets completion work with spaces in the graph entry
bar. In the search bar it still doesn't work, will require some thinking
- how to let a space be both and/or and part of a name. It's better to
  ditch it as an operator and use |/& or AND/OR.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/client/view/completer.js b/src/client/view/completer.js
index d1f1f13c..0ee4611a 100644
--- a/src/client/view/completer.js
+++ b/src/client/view/completer.js
@@ -106,11 +106,13 @@ var completer = (function (input_element, dropdown, base_config) {
 
     function get_config(base) {
         var trigger_start = base && base.triggerStart || rz_config.separator_string,
-            trigger_is_separator = (undefined === base || undefined === base.triggerStart);
+            trigger_start_is_separator = (undefined === base || undefined === base.triggerStart),
+            trigger_end_is_separator = (undefined === base || undefined === base.triggerEnd);
         return {
-            triggerStart: (trigger_is_separator && rz_config.separator_string.length > 1 ?
+            triggerStart: (trigger_start_is_separator && rz_config.separator_string.length > 1 ?
                 new RegExp(rz_config.separator_string) : anyof_re(trigger_start)),
-            triggerEnd: new RegExp(base && base.triggerEnd || ' '),
+            triggerEnd: (trigger_end_is_separator && rz_config.separator_string.length > 1 ?
+                new RegExp(rz_config.separator_string) : anyof_re(base && base.triggerEnd || ' ')),
             hideOnTab: base && base.hasOwnProperty('hideOnTab') ? base.hideOnTab : true,
             matchStartOfString: (base && base.matchStartOfString) || rz_config.node_edge_separator,
             appendSpaceOnEnter: (base && base.appendSpaceOnEnter) || false,