bkruse: branch aadk r1126 - in /branches/aadk: ./ config/scripts/astman.js

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Tue Jun 19 18:04:29 2007
New Revision: 1126

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1126
Log:
Merged revisions 1124 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/trunk

........
r1124 | bkruse | 2007-06-19 17:59:24 -0500 (Tue, 19 Jun 2007) | 1 line

Fixed the Active Channels Page. Problems: [1] We were calling astmanEngine instead of parent.astmanEngine. [2] We were calling an invalid callback. [3] We were trying to reference channelsCallback in the if statement, which does not exist. Its all fixed now :]
........

Modified:
    branches/aadk/   (props changed)
    branches/aadk/config/scripts/astman.js

Propchange: branches/aadk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 19 18:04:29 2007
@@ -1,1 +1,1 @@
-/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-1081,1085,1090,1094,1097,1100,1103,1116,1120
+/trunk:1-430,433-449,489-501,505-506,508-510,512-540,542-557,559,561-577,580-586,588-616,618-767,769-1081,1085,1090,1094,1097,1100,1103,1116,1120,1124

Modified: branches/aadk/config/scripts/astman.js
URL: http://svn.digium.com/view/asterisk-gui/branches/aadk/config/scripts/astman.js?view=diff&rev=1126&r1=1125&r2=1126
==============================================================================
--- branches/aadk/config/scripts/astman.js (original)
+++ branches/aadk/config/scripts/astman.js Tue Jun 19 18:04:29 2007
@@ -1125,11 +1125,7 @@
 			target=target.parentNode;
 		me.selecttarget = target.id;
 		target.className = "chanlistselected";
-
-		if(channelsCallback ){
-			channelsCallback (target.id);
-		}
-		//me.chancallback(target.id);
+		me.chancallback(target.id);
 	};
 
 	this.restoreTarget = function(targetname) {
@@ -1226,7 +1222,7 @@
 					foundactive = 1;
 				}
 				count++;
-				s = s + "\t<tr class='" + cclass + "' id='" + channels[x].channel + "' onClick='astmanEngine.clickChannel(event)'>";
+				s = s + "\t<tr class='" + cclass + "' id='" + channels[x].channel + "' onClick='parent.astmanEngine.clickChannel(event)'>";
 				s = s + "<td class='field_text'>" + channels[x].channel + "</td>";
 				if (channels[x].state)
 					s = s + "<td class='field_text'>" + channels[x].state + "</td>";