pari: branch 2.0 r3911 - /branches/2.0/config/js/

[SVN commits to the Asterisk-GUI project]

Author: pari
Date: Sat Sep 27 14:09:35 2008
New Revision: 3911

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

 * try loading guiversion.js and then continue with rest of the init process

 * IE going crazy when using default as an object property using 'default' instead.
   Took me more than a couple of hours to locate this.



Added:
    branches/2.0/config/js/guiversion.js
Modified:
    branches/2.0/config/js/index.js
    branches/2.0/config/js/pbx.js

Added: branches/2.0/config/js/guiversion.js
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/js/guiversion.js?view=auto&rev=3911
==============================================================================
--- branches/2.0/config/js/guiversion.js (added)
+++ branches/2.0/config/js/guiversion.js Sat Sep 27 14:09:35 2008
@@ -1,0 +1,2 @@
+
+

Modified: branches/2.0/config/js/index.js
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/js/index.js?view=diff&rev=3911&r1=3910&r2=3911
==============================================================================
--- branches/2.0/config/js/index.js (original)
+++ branches/2.0/config/js/index.js Sat Sep 27 14:09:35 2008
@@ -854,7 +854,7 @@
 };
 
 
-var localajaxinit = function(){
+var after_localajaxinit = function(){
 
 	if( window.console && window.console.firebug && window.console.firebug == '1.2.0b7' ){
 		alert('This version of firebug is known to break the gui.\n'
@@ -866,10 +866,6 @@
 	//if( typeof readcfg == 'undefined' ){
 	//	alert('readcfg undefined');
 	//}
-	$.getScript( 'js/guiversion.js', function(){
-		sessionData.gui_version = gui_version ;
-		_$('parent_div_guiVersion').innerHTML = "<font color='#8d8d8d'>GUI-version : " + sessionData.gui_version + '</font>';
-	});
 
 
 	if( sessionData.PLATFORM.isAA50 ){

Modified: branches/2.0/config/js/pbx.js
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/config/js/pbx.js?view=diff&rev=3911&r1=3910&r2=3911
==============================================================================
--- branches/2.0/config/js/pbx.js (original)
+++ branches/2.0/config/js/pbx.js Sat Sep 27 14:09:35 2008
@@ -30,7 +30,7 @@
 				var check_For_Contexts = {
 					general : { static : 'yes', writeprotect : 'no', clearglobalvars : 'yes' },
 					globals : { FEATURES : '' , DIALOPTIONS : '' , RINGTIME: '20', FOLLOWMEOPTIONS : '' },
-					default : {},
+					'default' : {},
 					'macro-stdexten' : [
 						'exten=s,1,Set(__DYNAMIC_FEATURES=${FEATURES})',
 						'exten=s,2,GotoIf($[${FOLLOWME_${ARG1}} = 1]?5:3)',
@@ -2278,3 +2278,14 @@
 		}
 	}
 };
+
+
+var localajaxinit = function(){
+	$.getScript( 'js/guiversion.js', function(){
+		try{
+			sessionData.gui_version = gui_version ;
+			_$('parent_div_guiVersion').innerHTML = "<font color='#8d8d8d'>GUI-version : " + sessionData.gui_version + '</font>';
+		}catch(err){}
+		after_localajaxinit();
+	});
+};