rbrindley: branch 2.0 r4998 - in /branches/2.0/config/js: meetme.js pbx.js

[SVN commits to the Asterisk-GUI project]

Author: rbrindley
Date: Mon Feb 15 04:27:43 2010
New Revision: 4998

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

- fixed an issue where conferences couldn't unselect to play MOH for first caller


Modified:
    branches/2.0/config/js/meetme.js
    branches/2.0/config/js/pbx.js

Modified: branches/2.0/config/js/meetme.js
URL: http://svnview.digium.com/svn/asterisk-gui/branches/2.0/config/js/meetme.js?view=diff&rev=4998&r1=4997&r2=4998
==============================================================================
--- branches/2.0/config/js/meetme.js (original)
+++ branches/2.0/config/js/meetme.js Mon Feb 15 04:27:43 2010
@@ -59,7 +59,7 @@
 		meetme_rooms.sortNumbers();
 		meetme_rooms.each( function(this_room){
 			var this_MEETME = ASTGUI.cloneObject(parent.sessionData.pbxinfo.conferences[this_room]) ;
-			var room_options = this_MEETME['configOptions'].betweenXY(',',')') ;
+			var room_options = this_MEETME['configOptions'].split("${EXTEN}")[1].betweenXY(',',')') ;
 
 			var newRow = DOM_table_mml.insertRow(-1);
 			newRow.className = ((DOM_table_mml.rows.length)%2==1)?'odd':'even';
@@ -134,7 +134,7 @@
 
 	var TMP_EDIT_BRIDGE = ASTGUI.cloneObject(parent.sessionData.pbxinfo.conferences[EDIT_BRIDGE]);
 
-	var room_options = TMP_EDIT_BRIDGE['configOptions'].betweenXY(',',')') ;
+	var room_options = TMP_EDIT_BRIDGE['configOptions'].split("${EXTEN}")[1].betweenXY(',',')') ;
 	var pwstr = TMP_EDIT_BRIDGE['pwdString'] ;
 	DOM_edit_Ext.value = EDIT_BRIDGE;
 	DOM_edit_Ext.disabled = true ;

Modified: branches/2.0/config/js/pbx.js
URL: http://svnview.digium.com/svn/asterisk-gui/branches/2.0/config/js/pbx.js?view=diff&rev=4998&r1=4997&r2=4998
==============================================================================
--- branches/2.0/config/js/pbx.js (original)
+++ branches/2.0/config/js/pbx.js Mon Feb 15 04:27:43 2010
@@ -1592,7 +1592,7 @@
 			if(!line.beginsWith('exten=') ){ return;}
 			var b = ASTGUI.parseContextLine.getExten(line) ;
 			var configOptions = line.afterChar('=');
-			var params = configOptions.betweenXY('|',')');
+			var params = configOptions.split("${EXTEN}")[1].betweenXY('|',')');
 			if( params.contains('a') &&  params.contains('A') ) { // if is a meetMe Admin Login
 				b = ASTGUI.parseContextLine.getArgs(line)[0] ;
 			}