diff --git a/src/apps/callflows/i18n/en-US.json b/src/apps/callflows/i18n/en-US.json index bda3e58..149f1f1 100644 --- a/src/apps/callflows/i18n/en-US.json +++ b/src/apps/callflows/i18n/en-US.json @@ -1319,6 +1319,10 @@ "timeout": { "label": "Timeout", "help": "How long, in milliseconds, to wait for the first DTMF" + }, + "terminators": { + "label": "Terminators", + "help": "What DTMFs will terminate collection before the timeout occurs" } }, diff --git a/src/apps/callflows/submodules/misc/misc.js b/src/apps/callflows/submodules/misc/misc.js index 7b890f3..3cc081e 100644 --- a/src/apps/callflows/submodules/misc/misc.js +++ b/src/apps/callflows/submodules/misc/misc.js @@ -972,6 +972,7 @@ define(function(require) { }, edit: function(node, callback) { var popup, popup_html; + var terminators = node.getMetadata('terminators') || []; popup_html = $(self.getTemplate({ name: 'collect-dtmf', @@ -981,7 +982,8 @@ define(function(require) { 'collection_name': node.getMetadata('collection_name') || '', 'max_digits': node.getMetadata('max_digits') || '', 'terminator': node.getMetadata('terminator') || '#', - 'timeout': node.getMetadata('timeout') || '5000' + 'timeout': node.getMetadata('timeout') || '5000', + 'terminators': terminators.join('') } }, submodule: 'misc' @@ -1002,6 +1004,7 @@ define(function(require) { setData('collection_name', $('#collect_dtmf_collection_input', popup_html).val()); setData('max_digits', $('#collect_dtmf_max_digits_input', popup_html).val()); setData('terminator', $('#collect_dtmf_terminator_input', popup_html).val()); + setData('terminators', $('#collect_dtmf_terminators_input', popup_html).val().split('')); setData('timeout', $('#collect_dtmf_timeout_input', popup_html).val()); popup.dialog('close'); diff --git a/src/apps/callflows/submodules/misc/views/collect-dtmf.html b/src/apps/callflows/submodules/misc/views/collect-dtmf.html index 372154c..f24337f 100644 --- a/src/apps/callflows/submodules/misc/views/collect-dtmf.html +++ b/src/apps/callflows/submodules/misc/views/collect-dtmf.html @@ -1,24 +1,44 @@
-