Improved www.ttss.krakow.pl
e076bac2e183cff9d6f9a9aa1fc838b9db4dcfaf..ac721dc18e5bf997afc016a486fa4788f094b148
2016-12-08 Jacek Kowalski
Add request in progress indicator
ac721d diff | tree
2016-12-08 Jacek Kowalski
Hide error message on successful AJAX response
e54544 diff | tree
2016-12-08 Jacek Kowalski
Do not stop refresh timer on failure
fd40e5 diff | tree
2 files modified
25 ■■■■■ changed files
index.html 6 ●●●●● patch | view | raw | blame | history
index.js 19 ●●●● patch | view | raw | blame | history
index.html
@@ -72,6 +72,12 @@
            </div>
        </nav>
        <div class="container-fluid">
            <div id="progress" class="progress" style="display: none;">
                <div id="progress-bar" class="progress-bar progress-bar-striped active" style="width: 100%">
                    <span id="progress-text" class="sr-only">Refreshing data...</span>
                </div>
            </div>
            <div id="alert" class="alert alert-danger alert-dismissible" style="display:none">
                <a href="#" class="close" id="alert-close" aria-label="close">&times;</a>
                <strong>Error occured!</strong> <span id="alert-text"></span>
index.js
@@ -30,6 +30,8 @@
var alert_text = document.getElementById('alert-text');
var alert_close = document.getElementById('alert-close');
var progress = document.getElementById('progress');
var parseStatusBoarding = '>>>';
function parseStatus(status) {
    switch(status.status) {
@@ -101,7 +103,6 @@
}
function fail(message, more) {
    if(refresh_timer) clearInterval(refresh_timer);
    if(times_timer) clearTimeout(times_timer);
    
    setText(alert_text, message);
@@ -124,6 +125,18 @@
    }
}
function fail_hide() {
    alert.style.display = 'none';
}
function loading_start() {
    progress.style.display = 'block';
}
function loading_end() {
    progress.style.display = 'none';
}
function loadTimes(stopId = null, clearRoute = false) {
    if(!stopId) stopId = stop_id;
    if(!stopId) return;
@@ -133,6 +146,7 @@
    
    refresh_button.removeAttribute('disabled');
    
    loading_start();
    times_xhr = $.get(
        ttss_base + '/passageInfo/stopPassages/stop' 
            + '?stop=' + encodeURIComponent(stopId)
@@ -232,9 +246,10 @@
        }
        
        startTimer(new Date());
        fail_hide();
        
        times_timer = setTimeout(function(){ loadTimes(); }, ttss_refresh);
    }).fail(fail_ajax);
    }).fail(fail_ajax).always(loading_end);
}
function declinate(num, singular, plural) {