rbrindley: branch 2.0 r4952 - /branches/2.0/config/js/menus.js

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Mon Jun 29 19:06:17 2009
New Revision: 4952

URL: http://svn.asterisk.org/svn-view/asterisk-gui?view=rev&rev=4952
Log:

- DISA and UserEvent actions now support top.session.delimiter

(closes issue #15246)
Reported by: hterag


Modified:
    branches/2.0/config/js/menus.js

Modified: branches/2.0/config/js/menus.js
URL: http://svn.asterisk.org/svn-view/asterisk-gui/branches/2.0/config/js/menus.js?view=diff&rev=4952&r1=4951&r2=4952
==============================================================================
--- branches/2.0/config/js/menus.js (original)
+++ branches/2.0/config/js/menus.js Mon Jun 29 19:06:17 2009
@@ -335,7 +335,7 @@
 				case 'Macro':
 					lbl('Macro');
 					$('#newstep_custom').show();
-					tip_chosenStep.innerHTML = "macroname|arg1|arg2 .... Executes a macro using the context 'macro-<macroname>'";
+					tip_chosenStep.innerHTML = "macroname,arg1,arg2 .... Executes a macro using the context 'macro-<macroname>'";
 					break;
 				default:
 					break;
@@ -396,7 +396,7 @@
 				newstep = 'Set(TIMEOUT(digit)=' + ASTGUI.getFieldValue('newstep_seconds') + ')';
 				break;
 			case 'DISA':
-				newstep = 'DISA(' + ASTGUI.getFieldValue('newstep_pwd') + '|' + ASTGUI.getFieldValue('newstep_disaContext') +')';
+				newstep = 'DISA(' + ASTGUI.getFieldValue('newstep_pwd') + top.session.delimiter + ASTGUI.getFieldValue('newstep_disaContext') +')';
 				break;
 			case 'ResponseTimeout':
 				newstep = 'Set(TIMEOUT(response)=' + ASTGUI.getFieldValue('newstep_seconds') + ')';
@@ -446,7 +446,7 @@
 				var tmp_EventName = ASTGUI.getFieldValue('newstep_UserEvent_eventname');
 				var tmp_EventBody = ASTGUI.getFieldValue('newstep_UserEvent_body');
 				if( tmp_EventBody.trim() ){
-					tmp_EventName = tmp_EventName + '|' + tmp_EventBody ;
+					tmp_EventName = tmp_EventName + top.session.delimiter' + tmp_EventBody ;
 				}
 				newstep =  'UserEvent('+ tmp_EventName + ')';
 				break;