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

some minor js improvements

Browse source
This commit is contained in:
Laura Klünder 2017-10-30 14:13:09 +01:00
parent 1efdad1f58
commit 7e34439882
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,7 @@ c3nav = {
}, },
_route_buttons_swap_click: function () { _route_buttons_swap_click: function () {
var $origin = $('#origin-input'), var $origin = $('#origin-input'),
$destination = $('#destination-input'); $destination = $('#destination-input'),
tmp = $origin.data('location'); tmp = $origin.data('location');
c3nav._locationinput_set($origin, $destination.data('location'), false); c3nav._locationinput_set($origin, $destination.data('location'), false);
c3nav._locationinput_set($destination, tmp, false); c3nav._locationinput_set($destination, tmp, false);
@ -84,8 +84,7 @@ c3nav = {
_locationinput_set: function (elem, location, update_map) { _locationinput_set: function (elem, location, update_map) {
// set a location input // set a location input
c3nav._locationinput_reset_autocomplete(); c3nav._locationinput_reset_autocomplete();
var $search = $('#search'), var location = (location === undefined) ? null : location,
location = (location === undefined) ? null : location,
title = (location === null) ? '' : location.title, title = (location === null) ? '' : location.title,
subtitle = (location === null) ? '' : location.subtitle; subtitle = (location === null) ? '' : location.subtitle;
elem.toggleClass('selected', location !== null).toggleClass('empty', location === null) elem.toggleClass('selected', location !== null).toggleClass('empty', location === null)
@ -133,7 +132,7 @@ c3nav = {
}, },
_locationinput_reset_autocomplete: function () { _locationinput_reset_autocomplete: function () {
// hide autocomplete // hide autocomplete
$autocomplete = $('#autocomplete'); var $autocomplete = $('#autocomplete');
$autocomplete.find('.focus').removeClass('focus'); $autocomplete.find('.focus').removeClass('focus');
$autocomplete.html(''); $autocomplete.html('');
c3nav._last_locationinput_words_key = null; c3nav._last_locationinput_words_key = null;
@ -217,12 +216,12 @@ c3nav = {
$(this).addClass('focus').siblings().removeClass('focus'); $(this).addClass('focus').siblings().removeClass('focus');
}, },
_locationinput_click_suggestion: function () { _locationinput_click_suggestion: function () {
$locationinput = $('#' + c3nav.current_locationinput); var $locationinput = $('#' + c3nav.current_locationinput);
c3nav._locationinput_set($locationinput, c3nav.locations_by_id[$(this).attr('data-id')]); c3nav._locationinput_set($locationinput, c3nav.locations_by_id[$(this).attr('data-id')]);
c3nav._locationinput_focus_next($locationinput); c3nav._locationinput_focus_next($locationinput);
}, },
_locationinput_focus_next: function (elem) { _locationinput_focus_next: function (elem) {
$next = $('.locationinput:not(.selected)'); var $next = $('.locationinput:not(.selected)');
if ($next.length === 0) { if ($next.length === 0) {
if (elem) elem.find('input').blur(); if (elem) elem.find('input').blur();
} else { } else {
@ -432,7 +431,7 @@ c3nav = {
className: 'location-popup' className: 'location-popup'
}, 'autoPanPaddingTopLeft', 'autoPanPaddingBottomRight')).addTo(c3nav._locationLayers[location.point[0]]); }, 'autoPanPaddingTopLeft', 'autoPanPaddingBottomRight')).addTo(c3nav._locationLayers[location.point[0]]);
result = {}; var result = {};
result[location.point[0]] = L.latLngBounds( result[location.point[0]] = L.latLngBounds(
(location.bounds !== undefined) ? L.GeoJSON.coordsToLatLngs(location.bounds) : [latlng, latlng] (location.bounds !== undefined) ? L.GeoJSON.coordsToLatLngs(location.bounds) : [latlng, latlng]
); );