diff --git a/scripts/haltestellen.js b/scripts/haltestellen.js index 18a389f..cc7d817 100644 --- a/scripts/haltestellen.js +++ b/scripts/haltestellen.js @@ -3,64 +3,6 @@ var DEBUG; -// xmlhttp object function -function getHTTPObject() { - - // debug log - if (DEBUG === 1) {console.log("xml http object function");} - - // variable definitions - var xhr; - - // check for availibility if xmlhttprequest object - if(window.XMLHttpRequest) { - xhr = new XMLHttpRequest(); - } else if(window.ActiveXObject) { - xhr = new ActiveXObject("Msxml2.XMLHTTP"); - } - - return xhr; - -} - - -// ajax call function -function ajaxCall(dataUrl, outputElement, callback, responseType) { - - // debug log - if (DEBUG === 1) {console.log("ajax function");} - - // variable definitions - var response, - request = getHTTPObject(); // get the xmlhttp object which is supported - - outputElement.innerHTML = "Lade Daten ..."; - - request.onreadystatechange = function() { - - if(request.readyState === 4 && request.status === 200) { - - //save ajax response - if (responseType === "json") { - response = JSON.parse(request.responseText); - } else if (responseType === "xml") { - response = request.responseXML; - } else { - response = request.responseText; - } - - // check if callback is a function - if(typeof callback === "function") { - callback(response); - } - } - }; - - request.open("get", dataUrl, true); - request.send(null); - -} - // wrap all in anonymous function to get out of global scope (function() { @@ -102,7 +44,7 @@ function ajaxCall(dataUrl, outputElement, callback, responseType) { hstUrl = encodeURI(serverUrl + "abfahrtsmonitor.py?query=abfahrten.do&ort=dresden&hst=" + hstName); // get the data from the server with an ajax call - ajaxCall(hstUrl, target, haltestelle.processAbfahrten, "text"); + gcf.ajaxCall(hstUrl, target, this.processAbfahrten, "text"); }, @@ -188,7 +130,7 @@ function ajaxCall(dataUrl, outputElement, callback, responseType) { hstUrl = encodeURI(serverUrl + "abfahrtsmonitor.py?query=haltestelle.do&ort=dresden&hst=" + hstName); // get the data from the server with an ajax call - ajaxCall(hstUrl, target, haltestelle.processHaltestellen, "text"); + gcf.ajaxCall(hstUrl, target, this.processHaltestellen, "text"); },