pari: trunk r311 - /trunk/config/setup/1.html

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

Author: pari
Date: Wed Jan 31 23:24:50 2007
New Revision: 311

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=311
Log:
Fix: In the first page of setup wizard, Show the end result even incase something fails during installguitools or scan_zapteldevices

Modified:
    trunk/config/setup/1.html

Modified: trunk/config/setup/1.html
URL: http://svn.digium.com/view/asterisk-gui/trunk/config/setup/1.html?view=diff&rev=311&r1=310&r2=311
==============================================================================
--- trunk/config/setup/1.html (original)
+++ trunk/config/setup/1.html Wed Jan 31 23:24:50 2007
@@ -66,14 +66,22 @@
 			if ( lines[i].substr(0,9) == "Category-"  ){
 				var tmp = lines[i].split(": ");
 				if( tmp[1].match(asterisk_guitools) ){
-					scan_zapteldevices();
+					try{
+						scan_zapteldevices();
+					}finally{
+						all_done();
+					}
 					return false;
 				}
 				cats.push(tmp[1]);
 			}
 	}
 	// Install the [asterisk_guitools] section in extensions.conf
-	installguitools();
+	try{
+		installguitools();
+	}finally{
+		if(	$('menu').style.display == "none" ){ 	all_done(); }
+	}
 }
 
 
@@ -81,7 +89,13 @@
 		var opt = {
 			method: 'get',
 			asynchronous: true,
-			onComplete: scan_zapteldevices
+			onComplete: function(){
+				try{
+					scan_zapteldevices();
+				}finally{
+					all_done();
+				}
+			}
 		};
 		opt.parameters="action=updateconfig&reload=yes&srcfilename=extensions.conf&dstfilename=extensions.conf&"  +
 
@@ -147,6 +161,10 @@
 }
 
 zapcallbacks.loaded = function(){
+
+}
+
+function all_done(){
 	for(var x=0; x< $('zapchan').length ; x++){
 			$('zapscan_info').innerHTML+= $('zapchan').options[x].text + "<BR>";
 	}