Commit a7c3539c authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Do not break departure refresh when detail view is open

parent bcc02b19

lib/DBInfoscreen/Helper/HAFAS.pm

+3 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ sub get_xml_p { 
	)->catch(

		sub {

			my ($err) = @_;

			$self->{log}->warn("hafas->get_json_p($url): $err");

			$self->{log}->warn("hafas->get_xml_p($url): $err");

			$promise->reject($err);

			return;

		}
@@ -222,6 +222,7 @@ sub trainsearch_p { 
				$promise->resolve($result);

			}

			else {

				$self->{log}->warn("hafas->trainsearch_p($opt{train_no}): train not found");

				$promise->reject("Zug $opt{train_no} nicht gefunden");

			}
@@ -233,6 +234,7 @@ sub trainsearch_p { 
	)->catch(

		sub {

			my ($err) = @_;

			$self->{log}->warn("hafas->trainsearch_p($opt{train_no}): $err");

			$promise->reject($err);



			# do not propagate $promise->reject's return value to this promise

public/static/css/material-icons.css

+4 −4
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
  font-family: 'Material Icons';

  font-style: normal;

  font-weight: 400;

  src: url(/static/v34/fonts/MaterialIcons-Regular.eot); /* For IE6-8 */

  src: url(/static/v35/fonts/MaterialIcons-Regular.eot); /* For IE6-8 */

  src: local('Material Icons'),

       local('MaterialIcons-Regular'),

       url(/static/v34/fonts/MaterialIcons-Regular.woff2) format('woff2'),

       url(/static/v34/fonts/MaterialIcons-Regular.woff) format('woff'),

       url(/static/v34/fonts/MaterialIcons-Regular.ttf) format('truetype');

       url(/static/v35/fonts/MaterialIcons-Regular.woff2) format('woff2'),

       url(/static/v35/fonts/MaterialIcons-Regular.woff) format('woff'),

       url(/static/v35/fonts/MaterialIcons-Regular.ttf) format('truetype');

}



.material-icons {

public/static/js/collapse.js

+14 −7
Original line number Diff line number Diff line 
function reload_app() {

	// TODO use a variable instead of window.location.href, as

	// window.locatin.href may be /z/...

	// Until then, we guard it by only reloading whin moreinfo is not expanded.

	if ($('.expanded-moreinfo').length == 0) {

		$.get(window.location.href, {ajax: 1}, function(data) {

			$('div.app > ul').html(data);

			dbf_reg_handlers();
@@ -6,6 +10,9 @@ function reload_app() { 
		}).fail(function() {

			setTimeout(reload_app, 10000);

		});

	} else {

		setTimeout(reload_app, 30000);

	}

}



function dbf_reg_handlers() {

public/static/js/dbf.min.js

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

public/static/v33→public/static/v35

+0 −0

File moved.

View file