oops, guess I had forgotten about this file

[ndwebbie.git] / raid.js

diff --git a/raid.js b/raid.js
index 0e2fedc5130aa9170165bc78187aa95d4f68092c..ecebcbdb085813f7af37bc0eef802ae5410c2d96 100644 (file)
--- a/raid.js
+++ b/raid.js
@@ -30,7 +30,7 @@ var modified = '_';
 function claim(dataSource, target, wave,cmd){
        var HTTP = getHTTPObject();
        if(HTTP) {
-               var url = dataSource + '&cmd='+cmd+'&target=' + target + '&wave=' + wave;
+               var url = dataSource + '&cmd='+cmd+'&target=' + target + '&wave=' + wave + '&rand='+ Math.random();
                //obj.innerHTML = "test";
                HTTP.open("GET", url,true);
                HTTP.onreadystatechange = function(){
@@ -40,7 +40,7 @@ function claim(dataSource, target, wave,cmd){
                                var obj = document.getElementById("targets");
                                if (obj){
                                        clearObject(obj);
-                                       var re = new RegExp("targetlist>(.*)</targetlist", "m");
+                                       var re = new RegExp("targetlist>((.|\\n)*)</targetlist");
                                        if(re.test(HTTP.responseText))
                                                obj.innerHTML = RegExp.$1;
                                }
@@ -58,14 +58,14 @@ function clearObject(obj){
 
 function listTargets(dataSource){
        var http = getHTTPObject();
-       http.open("GET",dataSource+'&cmd=gettargets',true);
+       http.open("GET",dataSource+'&cmd=gettargets' + '&rand='+ Math.random(),true);
        http.onreadystatechange = function(){
                if (http.readyState == 4 &&
                                http.status == 200) {
                        var obj = document.getElementById("targets");
                        if (obj){
                                clearObject(obj);
-                               var re = new RegExp("targetlist>(.*)</targetlist", "m");
+                               var re = new RegExp("targetlist>((.|\\n)*)</targetlist");
                                if(re.test(http.responseText))
                                        obj.innerHTML = RegExp.$1;
                        }
@@ -77,7 +77,7 @@ function listTargets(dataSource){
 function update(dataSource){
        var HTTP = getHTTPObject();
        if(HTTP) {
-               HTTP.open("GET",dataSource+"&cmd=update&from="+modified,true);
+               HTTP.open("GET",dataSource+"&cmd=update&from="+modified + '&rand='+ Math.random(),true);
                HTTP.onreadystatechange = function(){
                        if (HTTP.readyState == 4 &&
                                        HTTP.status == 200) {
@@ -88,8 +88,8 @@ function update(dataSource){
        }
 }
 
-function updateClaims(dataSource,xmldoc,timestamp){
-       targets = xmldoc.getElementsByTagName("target");
+function updateClaims(dataSource,xmlthingy,timestamp){
+       var targets = xmlthingy.getElementsByTagName("target");
        for (var i = 0; i < targets.length; i++){
                var target = targets[i].attributes.getNamedItem("id").nodeValue;
                var obj = document.getElementById("claim"+target);
@@ -119,7 +119,7 @@ function updateClaims(dataSource,xmldoc,timestamp){
                                b.type = 'button';
                                b.setAttribute("class", command);
                                b.value = command +' wave '+wave+' '+claimers;
-                               b.setAttribute("onClick", "claim('"+dataSource+"',"+target+","+wave+",'"+command+"')");
+                               b.setAttribute("onclick", "claim('"+dataSource+"',"+target+","+wave+",'"+command+"');");
                                /*b.onclick = function(){
                                        claim(dataSource,t,wave,command);
                                }*/
@@ -134,9 +134,10 @@ function updateClaims(dataSource,xmldoc,timestamp){
                                        b.value = 'N';
                                        command = 'set&joinable=FALSE';
                                }
-                               b.setAttribute("onClick", "claim('"+dataSource+"',"+target+","+wave+",'"+command+"')");
+                               b.setAttribute("onclick", "claim('"+dataSource+"',"+target+","+wave+",'"+command+"');");
                                obj.appendChild(b);
                        }
+                       obj.innerHTML = obj.innerHTML; // IE doesn't understand unless you tell it twice
                }
                obj = document.getElementById("coords"+target);
                var coords = targets[i].getElementsByTagName("coords");;
@@ -144,7 +145,7 @@ function updateClaims(dataSource,xmldoc,timestamp){
                        obj.innerHTML = coords[0].firstChild.nodeValue;
        }
        if (timestamp){
-               timestamp = xmldoc.getElementsByTagName("timestamp");
+               timestamp = xmlthingy.getElementsByTagName("timestamp");
                if (timestamp)
                        modified = timestamp[0].firstChild.nodeValue;
        }