Browse Source

* remove tag parentheses (<, >) from the response with the replace() method

* check for the origin of the url (with or without www) to select the suitable ajax url to fullfill the same origin policy
master
T. Meissner 11 years ago
parent
commit
04333c456b
1 changed files with 9 additions and 5 deletions
  1. +9
    -5
      scripts/haltestellen.js

+ 9
- 5
scripts/haltestellen.js View File

@ -2,10 +2,6 @@
// set to 1 to enable debug log // set to 1 to enable debug log
var DEBUG; var DEBUG;
// server url
//var serverUrl = "http://widgets.vvo-online.de/abfahrtsmonitor/";
var serverUrl = "http://goodcleanfun.de/cgi-bin/";
// xmlhttp object function // xmlhttp object function
function getHTTPObject() { function getHTTPObject() {
@ -70,6 +66,14 @@ function ajaxCall(dataUrl, outputElement, callback, responseType) {
// debug log // debug log
if (DEBUG === 1) {console.log("anonymous function");} if (DEBUG === 1) {console.log("anonymous function");}
// server url
var origin = window.location.origin.indexOf("www.goodcleanfun.de");
if (origin === -1) {
var serverUrl = "http://goodcleanfun.de/cgi-bin/";
} else {
var serverUrl = "http://www.goodcleanfun.de/cgi-bin/";
}
// get the search form // get the search form
var searchForm = document.getElementById("search-form"); var searchForm = document.getElementById("search-form");
@ -88,7 +92,6 @@ function ajaxCall(dataUrl, outputElement, callback, responseType) {
// get output area // get output area
var target = document.getElementById("output"); var target = document.getElementById("output");
var hstName = document.getElementById("q").value; var hstName = document.getElementById("q").value;
//var hstUrl = serverUrl + "Abfahrten.do?ort=dresden&hst=" + hstName;
var hstUrl = encodeURI(serverUrl + "abfahrtsmonitor.py?ort=dresden&hst=" + hstName); var hstUrl = encodeURI(serverUrl + "abfahrtsmonitor.py?ort=dresden&hst=" + hstName);
ajaxCall(hstUrl, target, function(data) { ajaxCall(hstUrl, target, function(data) {
@ -99,6 +102,7 @@ function ajaxCall(dataUrl, outputElement, callback, responseType) {
data = data.replace(/\],\[/gi, '#'); data = data.replace(/\],\[/gi, '#');
data = data.replace(/\(.+?\)/gi, ''); data = data.replace(/\(.+?\)/gi, '');
data = data.replace('ß', 'ss'); data = data.replace('ß', 'ss');
data = data.replace(/<(.+?)>/gi, '$1');
data = data.slice(3,-3).split("#"); data = data.slice(3,-3).split("#");
// debug log // debug log


Loading…
Cancel
Save