From b1154d8239000ea2593285e9ead9b7920653289d Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Fri, 14 Apr 2017 18:23:22 +0000
Subject: [PATCH] Remove popup when removing associated element from map
---
index.js | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/index.js b/index.js
index a5aba2b..04e285b 100644
--- a/index.js
+++ b/index.js
@@ -3,6 +3,7 @@
var ttss_refresh = 20000; // 20 seconds
var page_title = document.getElementsByTagName('title')[0];
+var ignore_hashchange = false;
var language = 'en';
var lang_select = document.getElementById('lang-select');
@@ -151,8 +152,11 @@
if(times_xhr) times_xhr.abort();
console.log('loadTimes(' + stopId + ')');
+ stop_id = stopId;
- window.location.hash = '#!' + language + stop_id;
+ ignore_hashchange = true;
+ window.location.hash = '#!' + language + stopId;
+ ignore_hashchange = false;
refresh_button.removeAttribute('disabled');
loading_start();
@@ -253,6 +257,7 @@
addCellWithText(tr, data.old[i].stop_seq_num + '. ' + data.old[i].stop.name);
tr.className = 'active';
+ tr.addEventListener('click', function(stopId){ return function(){ loadTimes(stopId); } }(data.old[i].stop.shortName) );
route_table.appendChild(tr);
}
@@ -264,6 +269,7 @@
if(data.actual[i].status == 'STOPPING') {
tr.className = 'success';
}
+ tr.addEventListener('click', function(stopId){ return function(){ loadTimes(stopId); } }(data.actual[i].stop.shortName) );
route_table.appendChild(tr);
}
}).fail(fail_ajax);
@@ -328,6 +334,9 @@
} else {
setText(refresh_text, lang.enter_stop_name_to_begin);
}
+
+ loadTimes();
+ loadRoute();
}
function change_language(lang) {
@@ -349,17 +358,20 @@
document.body.removeChild(document.getElementById('lang_script'));
document.body.appendChild(script);
+ ignore_hashchange = true;
window.location.hash = '#!' + language + stop_id;
+ ignore_hashchange = false;
}
function hash() {
+ if(ignore_hashchange) return;
+
if(window.location.hash.match(/^#![0-9]+$/)) {
loadTimes(parseInt(window.location.hash.substr(2)));
} else if(window.location.hash.match(/^#![a-z]{2}[0-9]*$/)) {
var stop = parseInt(window.location.hash.substr(4));
if(stop) stop_id = stop;
change_language(window.location.hash.substr(2, 2));
- loadTimes(stop_id);
}
}
@@ -410,8 +422,7 @@
stop_name_form.addEventListener('submit', function(e) {
e.preventDefault();
if(!stop_name_autocomplete.value) return;
- stop_id = stop_name_autocomplete.value;
- loadTimes(stop_id);
+ loadTimes(stop_name_autocomplete.value);
});
refresh_button.addEventListener('click', function(e) {
--
Gitblit v1.9.1