Prettified

This commit is contained in:
Unknown 2019-09-17 12:21:29 +02:00
parent 936e5732b2
commit 4854342c92
3 changed files with 21 additions and 21 deletions

View file

@ -82,11 +82,7 @@
</a> </a>
<div class="dropdown-menu" aria-labelledby="navbarLoadDropdown"> <div class="dropdown-menu" aria-labelledby="navbarLoadDropdown">
<div id="navbarLoadTracksContainer"> <div id="navbarLoadTracksContainer">
<a <a class="dropdown-item" data-i18n="navbar.load.tracks" href="#" id="navbarLoadTracks"
class="dropdown-item"
data-i18n="navbar.load.tracks"
href="#"
id="navbarLoadTracks"
>Tracks</a >Tracks</a
> >
</div> </div>

View file

@ -50,7 +50,7 @@ BR.LayersTab = BR.ControlLayers.extend({
if (self._layers[i].layer.setOpacity) { if (self._layers[i].layer.setOpacity) {
self._layers[i].layer.setOpacity(opacity); self._layers[i].layer.setOpacity(opacity);
} else { } else {
self._layers[i].layer.setStyle({opacity:opacity}); self._layers[i].layer.setStyle({ opacity: opacity });
} }
} }
} }

View file

@ -2,18 +2,18 @@ BR.tracksLoader = function(map, layersControl) {
TracksLoader = L.Control.FileLayerLoad.extend({ TracksLoader = L.Control.FileLayerLoad.extend({
options: { options: {
layer: L.geoJson, layer: L.geoJson,
layerOptions: {style: {color:'blue'}}, layerOptions: { style: { color: 'blue' } },
addToMap: false, addToMap: false,
// File size limit in kb (default: 1024) ? // File size limit in kb (default: 1024) ?
fileSizeLimit: 1024, fileSizeLimit: 1024
}, },
_initContainer: function () { _initContainer: function() {
var thisLoader = this.loader; var thisLoader = this.loader;
var fileInput; var fileInput;
var container = L.DomUtil.get('navbarLoadTracksContainer'); var container = L.DomUtil.get('navbarLoadTracksContainer');
// Create an invisible file input // Create an invisible file input
fileInput = L.DomUtil.create('input', 'hidden', container); fileInput = L.DomUtil.create('input', 'hidden', container);
fileInput.type = 'file'; fileInput.type = 'file';
@ -25,15 +25,19 @@ BR.tracksLoader = function(map, layersControl) {
} }
fileInput.style.display = 'none'; fileInput.style.display = 'none';
// Load on file change // Load on file change
fileInput.addEventListener('change', function () { fileInput.addEventListener(
thisLoader.loadMultiple(this.files); 'change',
// reset so that the user can upload the same file again if they want to function() {
this.value = ''; thisLoader.loadMultiple(this.files);
}, false); // reset so that the user can upload the same file again if they want to
this.value = '';
},
false
);
var link = L.DomUtil.get('navbarLoadTracks'); var link = L.DomUtil.get('navbarLoadTracks');
L.DomEvent.disableClickPropagation(link); L.DomEvent.disableClickPropagation(link);
L.DomEvent.on(link, 'click', function (e) { L.DomEvent.on(link, 'click', function(e) {
fileInput.click(); fileInput.click();
e.preventDefault(); e.preventDefault();
}); });
@ -44,13 +48,13 @@ BR.tracksLoader = function(map, layersControl) {
var tracksLoaderControl = new TracksLoader(); var tracksLoaderControl = new TracksLoader();
tracksLoaderControl.addTo(map); tracksLoaderControl.addTo(map);
tracksLoaderControl.loader.on('data:loaded', function (event) { tracksLoaderControl.loader.on('data:loaded', function(event) {
var layer = event.layer; var layer = event.layer;
layersControl.addOverlay(layer, event.filename); layersControl.addOverlay(layer, event.filename);
layer.addTo(map); layer.addTo(map);
}); });
tracksLoaderControl.loader.on('data:error', function (event) { tracksLoaderControl.loader.on('data:error', function(event) {
var err = event.error; var err = event.error;
BR.message.showError( BR.message.showError(
i18next.t('warning.tracks-load-error', { i18next.t('warning.tracks-load-error', {
@ -60,4 +64,4 @@ BR.tracksLoader = function(map, layersControl) {
}); });
return tracksLoaderControl; return tracksLoaderControl;
}; };