Collect DTMF submodule - add field "terminators"

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"
 			}
 		},
 

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');

src/apps/callflows/submodules/misc/views/collect-dtmf.html

@@ -1,24 +1,44 @@
 <div class="collect-dtmf-popup dialog_popup callflows-port">
 	<form name="form" method="post" action="#">
 		<div class="form_content">
-			<div class="popup_field">
-				<label for="collect_dtmf_collection_input"><i class="help-popover fa fa-question" data-toggle="tooltip" data-placement="right" data-original-title="{{ i18n.callflows.collectDTMF.collectionName.help }}"></i>{{ i18n.callflows.collectDTMF.collectionName.label }}</label>
+			<div class="popup_field clear">
+				<label for="collect_dtmf_collection_input">
+					<i class="help-popover fa fa-question"
+					   data-toggle="tooltip"
+					   data-placement="right"
+					   data-original-title="{{ i18n.callflows.collectDTMF.collectionName.help }}"></i>
+					{{ i18n.callflows.collectDTMF.collectionName.label }}
+				</label>
 				<input type="text" id="collect_dtmf_collection_input" class="medium" value="{{ data_dtmf.collection_name }}"/>
 			</div>
 			
-			<div class="popup_field">
-				<label for="collect_dtmf_interdigit_input"><i class="help-popover fa fa-question" data-toggle="tooltip" data-placement="right" data-original-title="{{ i18n.callflows.collectDTMF.interdigitTimeout.help }}"></i>{{ i18n.callflows.collectDTMF.interdigitTimeout.label }}</label>
+			<div class="popup_field clear">
+				<label for="collect_dtmf_interdigit_input">
+					<i class="help-popover fa fa-question"
+					   data-toggle="tooltip" data-placement="right"
+					   data-original-title="{{ i18n.callflows.collectDTMF.interdigitTimeout.help }}"></i>
+					{{ i18n.callflows.collectDTMF.interdigitTimeout.label }}
+				</label>
 				<input type="text" id="collect_dtmf_interdigit_input" class="medium" value="{{ data_dtmf.interdigit_timeout }}"/>
 			</div>
 
-			<div class="popup_field">
-				<label for="collect_dtmf_max_digits_input"><i class="help-popover fa fa-question" data-toggle="tooltip" data-placement="right" data-original-title="{{ i18n.callflows.collectDTMF.maxDigits.help }}"></i>{{ i18n.callflows.collectDTMF.maxDigits.label }}</label>
+			<div class="popup_field clear">
+				<label for="collect_dtmf_max_digits_input">
+					<i class="help-popover fa fa-question"
+					   data-toggle="tooltip"
+					   data-placement="right"
+					   data-original-title="{{ i18n.callflows.collectDTMF.maxDigits.help }}"></i>
+					{{ i18n.callflows.collectDTMF.maxDigits.label }}
+				</label>
 				<input type="text" id="collect_dtmf_max_digits_input" class="medium" value="{{ data_dtmf.max_digits }}"/>
 			</div>
 
-			<div class="popup_field">
+			<div class="popup_field clear">
 				<label for="collect_dtmf_terminator_input">
-					<i class="help-popover fa fa-question" data-toggle="tooltip" data-placement="right" data-original-title="{{ i18n.callflows.collectDTMF.terminator.help }}"></i>
+					<i class="help-popover fa fa-question"
+					   data-toggle="tooltip"
+					   data-placement="right"
+					   data-original-title="{{ i18n.callflows.collectDTMF.terminator.help }}"></i>
 					{{ i18n.callflows.collectDTMF.terminator.label }}
 				</label>
 				<div class="select_wrapper">
@@ -42,8 +62,30 @@
 				</div>
 			</div>
 
-			<div class="popup_field">
-				<label for="collect_dtmf_timeout_input"><i class="help-popover fa fa-question" data-toggle="tooltip" data-placement="right" data-original-title="{{ i18n.callflows.collectDTMF.timeout.help }}"></i>{{ i18n.callflows.collectDTMF.timeout.label }}</label>
+			<div class="popup_field clear">
+				<label for="collect_dtmf_terminators_input">
+					<i class="help-popover fa fa-question"
+					   data-toggle="tooltip"
+					   data-placement="right"
+					   data-original-title="{{ i18n.callflows.collectDTMF.terminators.help }}"></i>
+					{{ i18n.callflows.collectDTMF.terminators.label }}
+				</label>
+				<input type="text"
+					   id="collect_dtmf_terminators_input"
+					   class="medium"
+					   value="{{ data_dtmf.terminators }}"
+					   placeholder="1234567890#*"
+				/>
+			</div>
+
+			<div class="popup_field clear">
+				<label for="collect_dtmf_timeout_input">
+					<i class="help-popover fa fa-question"
+					   data-toggle="tooltip"
+					   data-placement="right"
+					   data-original-title="{{ i18n.callflows.collectDTMF.timeout.help }}"></i>
+					{{ i18n.callflows.collectDTMF.timeout.label }}
+				</label>
 				<input type="text" id="collect_dtmf_timeout_input" class="medium" value="{{ data_dtmf.timeout }}"/>
 			</div>