bkruse: branch aadk r840 - in /branches/aadk: ./ config/ config/setup/

[asterisk-gui-commits at lists.digium.com]

Author: bkruse
Date: Tue May  1 16:40:40 2007
New Revision: 840

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=840
Log:
Merged revisions 836,838 via svnmerge from
https://origsvn.digium.com/svn/asterisk-gui/trunk

........
r836 | pari | 2007-05-01 12:37:47 -0500 (Tue, 01 May 2007) | 1 line

Fix: GUI not properly identifying response timeout and digit timeout
........
r838 | bkruse | 2007-05-01 16:36:26 -0500 (Tue, 01 May 2007) | 1 line

Going back to the old way, registering events for the onclick, as onclick directly in the div/radio button defined does NOT work.
........

Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/menus.html
    branches/aadk/config/setup/4.html

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue May  1 16:40:40 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-827
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-839

Modified: branches/aadk/config/menus.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/menus.html?view=diff&rev=840&r1=839&r2=840
==============================================================================
--- branches/aadk/config/menus.html (original)
+++ branches/aadk/config/menus.html Tue May  1 16:40:40 2007
@@ -58,12 +58,12 @@
 		temp[2] = temp[2].replace(/\)/, "");
 		return "Play '" + temp[2] + "' & Listen for KeyPress";
 	}
-	if( temp[2].match("DigitTimeout") ){
+	if( temp[2].match("TIMEOUT") && temp[2].match("digit") ){
 		temp[2] = temp[2].replace(/Set\(TIMEOUT\(digit\)\=/, "");
 		temp[2] = temp[2].replace(/\)/, "");
 		return "Wait '"+ temp[2] +"' sec for KeyPress";
 	}
-	if( temp[2].match("TIMEOUT") ){
+	if( temp[2].match("TIMEOUT") && temp[2].match("response") ){
 		temp[2] = temp[2].replace(/Set\(TIMEOUT\(response\)\=/, "");
 		temp[2] = temp[2].replace(/\)/, "");
 		return "Response Timeout to '" + temp[2] + "' sec";

Modified: branches/aadk/config/setup/4.html
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/setup/4.html?view=diff&rev=840&r1=839&r2=840
==============================================================================
--- branches/aadk/config/setup/4.html (original)
+++ branches/aadk/config/setup/4.html Tue May  1 16:40:40 2007
@@ -471,6 +471,11 @@
 	_$('customvoip').style.display="none";
 	_$('userscontent_title').innerHTML = "Add Service Provider";
 	isnewtrunk = 1;
+
+	add_event( _$('trunkstyleanalog') , 'click' , activateanalogvoip );
+	add_event( _$('trunkstylevoip') , 'click' , activateanalogvoip );
+	add_event( _$('trunkstylecustomvoip') , 'click' , activateanalogvoip );
+
 	return tmp;
 
 }
@@ -750,13 +755,13 @@
 					<select id='hiddenglobals'></select>
 				</div> Provider Type:<BR>
 				<LABEL FOR="trunkstyleanalog">
-					<input name='trunkstyle' type='radio' id='trunkstyleanalog' onclick='activateanalogvoip()' value='analog'>Analog
+					<input name='trunkstyle' type='radio' id='trunkstyleanalog' value='analog'>Analog
 				</LABEL><BR>
 				<LABEL FOR="trunkstylevoip">
-					<input name='trunkstyle' type='radio' id='trunkstylevoip' onclick='activateanalogvoip()' value='voip'>VoIP
+					<input name='trunkstyle' type='radio' id='trunkstylevoip' value='voip'>VoIP
 				</LABEL><BR>
 				<LABEL FOR="trunkstylecustomvoip">
-					<input name='trunkstyle' type='radio' id='trunkstylecustomvoip' onclick='activateanalogvoip()' value='customvoip'>Custom VoIP
+					<input name='trunkstyle' type='radio' id='trunkstylecustomvoip' value='customvoip'>Custom VoIP
 				</LABEL>
 				<div id="div_providername" style="display:none">
 					<BR><BR><B>Provider Name:</B><BR>