summaryrefslogtreecommitdiff
path: root/src/client/view
diff options
context:
space:
mode:
authorAlon Levy <alon@pobox.com>2015-03-03 09:40:57 +0200
committerAlon Levy <alon@pobox.com>2015-03-03 09:45:54 +0200
commit672369b121682019c84a7a068b5432f8d265d53f (patch)
treeab6c83162b39abd5eb90885ffa8865063a348834 /src/client/view
parent00747071e50cc20b83801927fa41ae52c8c5fa3e (diff)
client/completer: fix handling of separator that is more then one char
Diffstat (limited to 'src/client/view')
-rw-r--r--src/client/view/completer.js7
1 files changed, 5 insertions, 2 deletions
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,