2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

when loading searchable locations, catch 304 not mofied and just keep the data

Browse source
This commit is contained in:
Laura Klünder 2019-12-22 01:24:32 +01:00
parent 1c38df81d0
commit d3e9134d5a
1 changed files with 29 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/c3nav/site/static/site/js/c3nav.js
View file

@ -84,9 +84,14 @@ c3nav = {
} }
}, },
_searchable_locations_timer: null, _searchable_locations_timer: null,
load_searchable_locations: function() { load_searchable_locations: function(firstTime) {
c3nav._searchable_locations_timer = null; c3nav._searchable_locations_timer = null;
$.getJSON('/api/locations/?searchable', c3nav._searchable_locations_loaded).fail(function() { $.ajax({
dataType: "json",
url: '/api/locations/?searchable',
success: c3nav._searchable_locations_loaded,
ifModified: true,
}).fail(function() {
if(c3nav._searchable_locations_timer === null) { if(c3nav._searchable_locations_timer === null) {
c3nav._searchable_locations_timer = window.setTimeout(c3nav.load_searchable_locations, c3nav.init_completed ? 300000 : 15000); c3nav._searchable_locations_timer = window.setTimeout(c3nav.load_searchable_locations, c3nav.init_completed ? 300000 : 15000);
} }
@ -95,28 +100,31 @@ c3nav = {
_last_time_searchable_locations_loaded: null, _last_time_searchable_locations_loaded: null,
_searchable_locations_interval: 120000, _searchable_locations_interval: 120000,
_searchable_locations_loaded: function(data) { _searchable_locations_loaded: function(data) {
// todo, do nothing on 304 not modified
c3nav._last_time_searchable_locations_loaded = Date.now(); c3nav._last_time_searchable_locations_loaded = Date.now();
var locations = [], if (data !== undefined) {
locations_by_id = {}, var locations = [],
labels = {}; locations_by_id = {},
for (var i = 0; i < data.length; i++) { labels = {};
var location = data[i]; for (var i = 0; i < data.length; i++) {
location.elem = c3nav._build_location_html(location); var location = data[i];
location.title_words = location.title.toLowerCase().split(/\s+/); location.elem = c3nav._build_location_html(location);
location.subtitle_words = location.subtitle.toLowerCase().split(/\s+/); location.title_words = location.title.toLowerCase().split(/\s+/);
location.match = ' ' + location.title_words.join(' ') + ' ' + location.subtitle_words.join(' ') + ' ' + location.slug; location.subtitle_words = location.subtitle.toLowerCase().split(/\s+/);
locations.push(location); location.match = ' ' + location.title_words.join(' ') + ' ' + location.subtitle_words.join(' ') + ' ' + location.slug;
locations_by_id[location.id] = location; locations.push(location);
if (location.point && location.label_settings) { locations_by_id[location.id] = location;
location.label = c3nav._build_location_label(location); if (location.point && location.label_settings) {
if (!(location.point[0] in labels)) labels[location.point[0]] = []; location.label = c3nav._build_location_label(location);
labels[location.point[0]].push(location); if (!(location.point[0] in labels)) labels[location.point[0]] = [];
labels[location.point[0]].push(location);
}
} }
c3nav.locations = locations;
c3nav.locations_by_id = locations_by_id;
c3nav.labels = labels;
} else {
// 304, nothing to do!
} }
c3nav.locations = locations;
c3nav.locations_by_id = locations_by_id;
c3nav.labels = labels;
if (!c3nav.init_completed) { if (!c3nav.init_completed) {
c3nav.continue_init(); c3nav.continue_init();
} }