From 672369b121682019c84a7a068b5432f8d265d53f Mon Sep 17 00:00:00 2001 From: Alon Levy Date: Tue, 3 Mar 2015 09:40:57 +0200 Subject: client/completer: fix handling of separator that is more then one char --- src/client/view/completer.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/client') diff --git a/src/client/view/completer.js b/src/client/view/completer.js index f2aac257..eb674d7b 100644 --- a/src/client/view/completer.js +++ b/src/client/view/completer.js @@ -93,9 +93,12 @@ 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); return { - triggerStart: anyof_re(base && base.triggerStart || rz_config.separator_string), - triggerEnd: anyof_re(base && base.triggerEnd || ' '), + triggerStart: (trigger_is_separator && rz_config.separator_string.length > 1 ? + new RegExp(rz_config.separator_string) : anyof_re(trigger_start)), + triggerEnd: new RegExp(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, -- cgit v1.3.1