subservices getting now in background

diff --git a/webinterface/src/web-data/templates.js b/webinterface/src/web-data/templates.js
index 766a94e..d9caebf 100644 (file)
--- a/webinterface/src/web-data/templates.js
+++ b/webinterface/src/web-data/templates.js
@@ -48,6 +48,7 @@ var tplServiceListHeader  = '<table border="0" cellpadding="0" cellspacing="0" c
        tplServiceListHeader += '</tr>\n';
        tplServiceListHeader += '</thead>\n';
        tplServiceListHeader += '<tbody class="scrollContent">\n';
+       tplServiceListHeader += '<input type="hidden" id="mainServiceRef" name="mainServiceRef" value="%(mainServiceRef)">\n';
 
 var tplServiceListItem  = '<tr id="%(servicereference)extend">\n';
        tplServiceListItem += '<td style="border-top: 2px solid #AAA;" ><div class="sListSName"><a id="%(servicereference)" onclick="zap(this.id);" class="sListSLink">%(servicename)</a></div>';

diff --git a/webinterface/src/web-data/tools.js b/webinterface/src/web-data/tools.js
index 8055d58..f75ced3 100644 (file)
--- a/webinterface/src/web-data/tools.js
+++ b/webinterface/src/web-data/tools.js
@@ -345,6 +345,9 @@ function parentPin(servicereference) {
                return false;
        }
 }
+var SubServicePoller;
+var SubServicePollerCounter = 0;
+var SubServicePollerRef = null;
 function zap(servicereference){
        if(parentPin(servicereference)) {
                new Ajax.Request( "/web/zap?ZapTo=" + servicereference, 
@@ -352,7 +355,13 @@ function zap(servicereference){
                                                                 method: 'get'
                                                        }
                                                );
-               //getSubServices(servicereference);
+               if(SubServicePoller != 0){
+                       clearInterval(SubServicePoller);
+                       SubServicePollerCounter = 0;
+               }
+               SubServicePollerRef = servicereference;
+               SubServicePoller = setInterval(getSubServices, 10000);
+               SubServicePollerCounter = 1;
        }
 }
 
@@ -1409,7 +1418,9 @@ function ownLazyNumber(num) {
 var subServicesInsertedList = new Object();
 
 function getSubServices(servicereference) {
-               doRequest(url_subservices,incomingSubServiceRequest, false);
+       clearInterval(SubServicePoller);
+       SubServicePollerCounter = 0;
+       doRequest(url_subservices,incomingSubServiceRequest, false);
 }
 function incomingSubServiceRequest(request){
        if(request.readyState == 4){
@@ -1417,7 +1428,7 @@ function incomingSubServiceRequest(request){
                listerHtml      = '';           
                debug("got "+services.length+" SubServices");
                if(services.length > 1) {
-
+                       
                        first = services[0];
                        var mainChannellist = loadedChannellist[String($('mainServiceRef').value)];
                        
@@ -1438,7 +1449,6 @@ function incomingSubServiceRequest(request){
                                        mainChannellist.splice(i);
                                }
                        }
-
                        for ( var i = 0; i < services.length ; i++){
                                var reference = services[i];
                                var namespace = {       
@@ -1450,7 +1460,6 @@ function incomingSubServiceRequest(request){
                                        mainChannellist = mainChannellist.insert(oldEntryPosition++, reference);
                                }
                        }
-
                        document.getElementById(first.getServiceReference()+'extend').innerHTML = listerHtml;
                        subServicesInsertedList[String(first.getServiceReference())] = services;
                        loadedChannellist[$('mainServiceRef').value] = mainChannellist;