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

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

Author: pari
Date: Thu Mar  1 17:17:22 2007
New Revision: 394

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=394
Log:
Undoing the changes done in commit 311, the code in finally{} is being executed long before all the callbacks in the try{} are executed - my bad.

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=394&r1=393&r2=394
==============================================================================
--- trunk/config/setup/1.html (original)
+++ trunk/config/setup/1.html Thu Mar  1 17:17:22 2007
@@ -66,22 +66,14 @@
 			if ( lines[i].substr(0,9) == "Category-"  ){
 				var tmp = lines[i].split(": ");
 				if( tmp[1].match(asterisk_guitools) ){
-					try{
-						scan_zapteldevices();
-					}finally{
-						all_done();
-					}
+					scan_zapteldevices();
 					return false;
 				}
 				cats.push(tmp[1]);
 			}
 	}
 	// Install the [asterisk_guitools] section in extensions.conf
-	try{
-		installguitools();
-	}finally{
-		if(	$('menu').style.display == "none" ){ 	all_done(); }
-	}
+	installguitools();
 }
 
 
@@ -89,16 +81,9 @@
 		var opt = {
 			method: 'get',
 			asynchronous: true,
-			onComplete: function(){
-				try{
-					scan_zapteldevices();
-				}finally{
-					all_done();
-				}
-			}
+			onComplete: scan_zapteldevices
 		};
 		opt.parameters="action=updateconfig&reload=yes&srcfilename=extensions.conf&dstfilename=extensions.conf&"  +
-
 
 		"Action-000000=newcat&Cat-000000=" + asterisk_guitools + "&Var-000000=&Value-000000=" + "&" + 
 		
@@ -161,10 +146,6 @@
 }
 
 zapcallbacks.loaded = function(){
-
-}
-
-function all_done(){
 	for(var x=0; x< $('zapchan').length ; x++){
 			$('zapscan_info').innerHTML+= $('zapchan').options[x].text + "<BR>";
 	}