ben/brouter-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #197 from nrenner/fix-edge-export

Browse source 
Fix edge export feature + translations
This commit is contained in:
Norbert Renner 2019-05-31 11:44:43 +02:00 • committed by GitHub
commit 0b88114ae1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
css/style.css
View file

@ -484,3 +484,9 @@ table.dataTable.display tbody tr.even:hover {
padding-right: 2px; padding-right: 2px;
border: none; border: none;
} }
.nav-link.disabled {
/* by default, even if disabled, modals are opened by disabled nav-link
so we ignore pointer events in this situation to avoid that*/
pointer-events: none;
}

8
index.html
View file

@ -87,7 +87,7 @@
</select> </select>
</div> </div>
</form> </form>
<div class="nav-item dropdown"> <div class="nav-item">
<a <a
class="nav-link" class="nav-link"
data-toggle="modal" data-toggle="modal"
@ -574,7 +574,7 @@
/> />
</div> </div>
</div> </div>
<fieldset class="form-group row"> <fieldset id="export-format" class="form-group row">
<legend <legend
class="col-form-legend col-sm-2" class="col-form-legend col-sm-2"
data-i18n="export.format" data-i18n="export.format"
@ -655,7 +655,7 @@
<button <button
type="button" type="button"
class="btn btn-secondary" class="btn btn-secondary"
data-i18n="[value]modal.close" data-i18n="modal.close"
data-dismiss="modal" data-dismiss="modal"
> >
Close Close
@ -663,7 +663,7 @@
<button <button
type="button" type="button"
class="btn btn-primary" class="btn btn-primary"
data-i18n="[value]export.title" data-i18n="export.title"
id="submitExport" id="submitExport"
> >
Export route Export route

4
js/control/Export.js
View file

@ -23,7 +23,9 @@ BR.Export = L.Class.extend({
_export: function() { _export: function() {
var exportForm = document.forms['export']; var exportForm = document.forms['export'];
var format = exportForm['format'].value; var format =
exportForm['format'].value ||
$('#export-format input:radio:checked').val();
var name = encodeURIComponent(exportForm['trackname'].value); var name = encodeURIComponent(exportForm['trackname'].value);
var uri = this.router.getUrl(this.latLngs, format, name); var uri = this.router.getUrl(this.latLngs, format, name);