bkruse: trunk r1440 - in /trunk: ./ config/digital.html

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Thu Aug 23 14:43:10 2007
New Revision: 1440

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1440
Log:
Merged revisions 1439 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/branches/1.4

........
r1439 | bkruse | 2007-08-23 14:42:47 -0500 (Thu, 23 Aug 2007) | 5 lines

Give some time for ztscan to run before reading the config.

Works great now!


........

Modified:
    trunk/   (props changed)
    trunk/config/digital.html

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Aug 23 14:43:10 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1291,1293,1298-1300,1326,1332,1336-1338,1342,1346,1349,1356,1359,1362,1381,1384,1395,1399,1402,1413,1416,1426,1432,1435
+/branches/1.4:1-1291,1293,1298-1300,1326,1332,1336-1338,1342,1346,1349,1356,1359,1362,1381,1384,1395,1399,1402,1413,1416,1426,1432,1435,1439

Modified: trunk/config/digital.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/digital.html?view=diff&rev=1440&r1=1439&r2=1440
==============================================================================
--- trunk/config/digital.html (original)
+++ trunk/config/digital.html Thu Aug 23 14:43:10 2007
@@ -159,22 +159,26 @@
 	return true;
 }
 
+function load_config_tool() { 
+	if(!config2json("ztscan.conf", 1, digitalparse)) {
+		alert("Have you properly installed ztscan to /sbin/ztscan?\n/etc/asterisk/ztscan.conf does not exist.");
+		_$('error_txt').style.display="";
+		_$('error_txt').innerHTML="<br><br>Problem Detecting/No Cards(or spans) Found!<br><br>  Error: No Config File";		
+	}
+}
 
 function localajaxinit() {
 	ASTGUI.events.add(document, 'mouseover', show_tooltip);
 	showdiv_statusmessage();
 	_$('status_message').style.display="block";
-	setTimeout("_$('status_message').style.display='none'", 2000);
+	setTimeout("_$('status_message').style.display='none'", 5000);
 	_$('message_text').innerHTML = "Detecting Digital Cards ... (Beta)";
 	setWindowTitle("Digital Setup Wizard");
 	parent.loadscreen(this);
-	parent.astmanEngine.run_tool(asterisk_guiZtscan, onSuccess = function() { 
-		if(!config2json("ztscan.conf", 1, digitalparse)) {
-			alert("Have you properly installed ztscan to /sbin/ztscan?\n/etc/asterisk/ztscan.conf does not exist.");
-			_$('error_txt').style.display="";
-			_$('error_txt').innerHTML="<br><br>Problem Detecting/No Cards(or spans) Found!<br><br>  Error: No Config File";		
-		}
-	}); 
+	/* Give ztscan 4 seconds to detect and write to ztscan.conf */
+	parent.astmanEngine.run_tool(asterisk_guiZtscan, function(t) {
+		setTimeout('load_config_tool()', 4000); 
+	});
 }
 
 function free_mem(){