nakarte

Source code of https://map.sikmir.ru (fork)
git clone git://git.sikmir.ru/nakarte
Log | Files | Refs | LICENSE

commit f4f1149efedac3ca0e53d0f36b79d402fa7c36d8
parent 5739c303200dd4b6bb8229deb1e1fa2b81d3717f
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Tue,  3 Dec 2019 11:01:01 +0100

lint: fix empty blocks in try-except constructs

Diffstat:
Msrc/lib/leaflet.control.layers.configure/index.js | 1+
Msrc/lib/leaflet.control.locate/index.js | 4+++-
Msrc/lib/leaflet.control.track-list/lib/parsers/urlSafeBase64.js | 1+
Msrc/lib/leaflet.control.track-list/lib/services/baseService.js | 1+
Msrc/lib/leaflet.control.track-list/lib/services/movescount.js | 4+++-
Msrc/lib/leaflet.control.track-list/lib/services/strava.js | 4+++-
Msrc/lib/xhr-promise/index.js | 1+
7 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/lib/leaflet.control.layers.configure/index.js b/src/lib/leaflet.control.layers.configure/index.js @@ -480,6 +480,7 @@ function enableConfig(control, {layers, customLayersOrder}) { s = atob(s); fieldValues = JSON.parse(s); } catch (e) { + //ignore malformed data } if (fieldValues) { diff --git a/src/lib/leaflet.control.locate/index.js b/src/lib/leaflet.control.locate/index.js @@ -140,7 +140,9 @@ const LocateControl = L.Control.extend({ } else { storedPosition = null; } - } catch (e) {} + } catch (e) { + // ignore invalid data from localstorage + } if (storedPosition) { this._map.setView(forceLatLng ? forceLatLng : storedPosition, forceZoom ? forceZoom : zoom, {animate: false}); diff --git a/src/lib/leaflet.control.track-list/lib/parsers/urlSafeBase64.js b/src/lib/leaflet.control.track-list/lib/parsers/urlSafeBase64.js @@ -15,6 +15,7 @@ function decode(s) { try { decoded = atob(s); } catch (e) { + //will return null for malformed data } if (decoded && decoded.length) { return decoded; diff --git a/src/lib/leaflet.control.track-list/lib/services/baseService.js b/src/lib/leaflet.control.track-list/lib/services/baseService.js @@ -36,6 +36,7 @@ class BaseService { try { url = decodeURIComponent(url); } catch (e) { + // leave url as is } return url diff --git a/src/lib/leaflet.control.track-list/lib/services/movescount.js b/src/lib/leaflet.control.track-list/lib/services/movescount.js @@ -102,7 +102,9 @@ class MovescountMove extends MovescountBase { try { const title = dom.querySelector('title').text.trim(); name = title ? title : name; - } catch (_) {} + } catch (_) { + // use previously constructed name + } return [{ name, diff --git a/src/lib/leaflet.control.track-list/lib/services/strava.js b/src/lib/leaflet.control.track-list/lib/services/strava.js @@ -63,7 +63,9 @@ class Strava extends BaseService { } } name = name2; - } catch (e) {} + } catch (e) { + // use previously constructed name + } return [{ diff --git a/src/lib/xhr-promise/index.js b/src/lib/xhr-promise/index.js @@ -75,6 +75,7 @@ class XMLHttpRequestPromise { // xhr.response is readonly xhr.responseJSON = JSON.parse(xhr.response); } catch (e) { + // leave xhr.responseJSON undefined if response is not valid JSON } } else { xhr.responseJSON = xhr.response;