pari: branch 2.0 r3718 - in /branches/2.0/config: ./ js/

[SVN commits to the Asterisk-GUI project]

Author: pari
Date: Thu Aug 28 16:43:46 2008
New Revision: 3718

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=3718
Log:

 Ask confirmation only if providers.js URL is remote.



Modified:
    branches/2.0/config/js/providers.js
    branches/2.0/config/trunks_sps.html

Modified: branches/2.0/config/js/providers.js
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/js/providers.js?view=diff&rev=3718&r1=3717&r2=3718
==============================================================================
--- branches/2.0/config/js/providers.js (original)
+++ branches/2.0/config/js/providers.js Thu Aug 28 16:43:46 2008
@@ -10,7 +10,7 @@
 	DOM_table_SPS_list = _$('table_SPS_list');
         ASTGUI.domActions.clear_table(DOM_table_SPS_list);
         var newRow = DOM_table_SPS_list.insertRow(-1);
-	ASTGUI.domActions.tr_addCell( newRow , { html: "No Providers listed in Providers.js" } );
+	ASTGUI.domActions.tr_addCell( newRow , { html: "No Providers listed in providers.js" } );
 }
 
 loaded_external = true; // this should be the last line in the code, tells the page (that loaded this script) that the script has been loaded

Modified: branches/2.0/config/trunks_sps.html
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/trunks_sps.html?view=diff&rev=3718&r1=3717&r2=3718
==============================================================================
--- branches/2.0/config/trunks_sps.html (original)
+++ branches/2.0/config/trunks_sps.html Thu Aug 28 16:43:46 2008
@@ -138,6 +138,9 @@
 		})();
 	};
 
+	
+	if( ASTGUI.globals.providerUrl.toLowerCase().beginsWith('http') ){ // if remote js file, ask for user confirmation
+
 	var gp = config2json({filename: ASTGUI.globals.configfile, usf:1});
 	if( gp.hasOwnProperty('general') && gp['general'].getProperty('warning_providers') == 'yes' ){
 		LOAD_Providers();
@@ -158,7 +161,10 @@
 			dialogHeight: 230
 		});
 	}
-
+	
+	}else{
+		LOAD_Providers();
+	}
 }
 
 </script>