rbrindley: branch rbrindley/features_revamp r4744 - /team/rbrindley/features_...

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Fri Apr 17 09:30:57 2009
New Revision: 4744

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

- merged latest and greatest from branches/2.0


Modified:
    team/rbrindley/features_revamp/config/js/menus.js
    team/rbrindley/features_revamp/config/js/pbx.js

Modified: team/rbrindley/features_revamp/config/js/menus.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/features_revamp/config/js/menus.js?view=diff&rev=4744&r1=4743&r2=4744
==============================================================================
--- team/rbrindley/features_revamp/config/js/menus.js (original)
+++ team/rbrindley/features_revamp/config/js/menus.js Fri Apr 17 09:30:57 2009
@@ -24,7 +24,7 @@
 	alias_exten : '6070,1,Goto(voicemenu-custom-1|s|1)' ,   // line as read from [ASTGUI.contexts.VoiceMenuExtensions] context
 	includes : ['default'] , // contexts included in this voicemenu
 	steps : [ 's,1,Answer',  's,2,Wait(1)',  's,3,Background(thank-you-for-calling)' ]  , // sequence of steps - the 's' extension
-	keypressEvents : {
+	keypress_events : {
 		// key press events - assumption is that each key press action is defined in a single line 
 		// 	all priorities greater than 1 are ignored
 		// if you want a sequence of steps to be executed on a keypress 
@@ -532,7 +532,7 @@
 		alias_exten: '',
 		includes: [],
 		steps: [],
-		keypressEvents: {}
+		keypress_events: {}
 	};
 	vm = ASTGUI.toCustomObject(vm) ;
 	if( _$('vmenu_dialOther').checked ){
@@ -542,7 +542,7 @@
 	if(_$('vmenu_allowKeyPressEvents').checked){
 		['0','1','2','3','4','5','6','7','8','9','*','#','t','i'].each( function(this_key){
 			if ( _$( 'keyPress_' + this_key ).KPE ){
-				vm.keypressEvents[this_key] = _$( 'keyPress_' + this_key ).KPE ;
+				vm.keypress_events[this_key] = _$( 'keyPress_' + this_key ).KPE ;
 			}
 		} );
 	}
@@ -596,9 +596,9 @@
 	(function(){
 		var kpe = false;
 		['0','1','2','3','4','5','6','7','8','9','*','#','t','i'].each( function(this_key){
-			if ( THIS_VM.keypressEvents[this_key] ){
-				_$( 'keyPress_' + this_key ).innerHTML = ASTGUI.parseContextLine.showAs(THIS_VM.keypressEvents[this_key]) ;
-				_$( 'keyPress_' + this_key ).KPE = THIS_VM.keypressEvents[this_key] ;
+			if ( THIS_VM.keypress_events[this_key] ){
+				_$( 'keyPress_' + this_key ).innerHTML = ASTGUI.parseContextLine.showAs(THIS_VM.keypress_events[this_key]) ;
+				_$( 'keyPress_' + this_key ).KPE = THIS_VM.keypress_events[this_key] ;
 				kpe = true;
 			}else{
 				_$( 'keyPress_' + this_key ).innerHTML = '--';
@@ -701,7 +701,7 @@
 			var hasKeyPresssEvents = function(){
 				var u = ['0','1','2','3','4','5','6','7','8','9','*','#','t','i'] ;
 				for( var i = 0 ; i < u.length ; i++ ){
-					if( THIS_VM.hasOwnProperty('keypressEvents') && THIS_VM.keypressEvents.hasOwnProperty(u[i]) && THIS_VM.keypressEvents[u[i]].trim() ){
+					if( THIS_VM.hasOwnProperty('keypress_events') && THIS_VM.keypress_events.hasOwnProperty(u[i]) && THIS_VM.keypress_events[u[i]].trim() ){
 						return 'Yes';
 					}
 				}

Modified: team/rbrindley/features_revamp/config/js/pbx.js
URL: http://svn.digium.com/svn-view/asterisk-gui/team/rbrindley/features_revamp/config/js/pbx.js?view=diff&rev=4744&r1=4743&r2=4744
==============================================================================
--- team/rbrindley/features_revamp/config/js/pbx.js (original)
+++ team/rbrindley/features_revamp/config/js/pbx.js Fri Apr 17 09:30:57 2009
@@ -334,7 +334,7 @@
 			}
 			if( d.beginsWith(ASTGUI.contexts.VoiceMenuPrefix) ){ // if context is a voicemenu 
 				sessionData.pbxinfo['voicemenus'][d] = new ASTGUI.customObject; // create new object for this voicemenu
-				sessionData.pbxinfo['voicemenus'][d] = astgui_manageVoiceMenus.parseContext( c[d] );
+				sessionData.pbxinfo['voicemenus'][d] = pbx.voice_menus.parse(c[d]);
 				continue;
 			}