aboutsummaryrefslogtreecommitdiff
path: root/web/app/view/map/GeofenceMap.js
diff options
context:
space:
mode:
authorAshutosh Bishnoi <mail2bishnoi@gmail.com>2020-11-10 13:02:20 +0530
committerAshutosh Bishnoi <mail2bishnoi@gmail.com>2020-11-10 13:02:20 +0530
commita948981184f4f2884b7a35b67b2389ddcd1f52a8 (patch)
tree9187834b5246734da8549735f64d2e5546c60e1e /web/app/view/map/GeofenceMap.js
parent5a116350b3e402ef123a75451737c268a9ebddff (diff)
parent1af1545dc7ba3cfdf73a58031b37bea0ecff2e54 (diff)
downloadetbsa-traccar-web-a948981184f4f2884b7a35b67b2389ddcd1f52a8.tar.gz
etbsa-traccar-web-a948981184f4f2884b7a35b67b2389ddcd1f52a8.tar.bz2
etbsa-traccar-web-a948981184f4f2884b7a35b67b2389ddcd1f52a8.zip
Resolving conflicts with master
Diffstat (limited to 'web/app/view/map/GeofenceMap.js')
-rw-r--r--web/app/view/map/GeofenceMap.js20
1 files changed, 20 insertions, 0 deletions
diff --git a/web/app/view/map/GeofenceMap.js b/web/app/view/map/GeofenceMap.js
index 8cef574..18c3386 100644
--- a/web/app/view/map/GeofenceMap.js
+++ b/web/app/view/map/GeofenceMap.js
@@ -37,6 +37,26 @@ Ext.define('Traccar.view.map.GeofenceMap', {
listeners: {
select: 'onTypeSelect'
}
+ }, '-', {
+ xtype: 'tbtext',
+ html: Strings.sharedImport
+ }, {
+ xtype: 'filefield',
+ name: 'file',
+ buttonConfig: {
+ glyph: 'xf093@FontAwesome',
+ text: '',
+ tooltip: Strings.sharedSelectFile,
+ tooltipType: 'title'
+ },
+ listeners: {
+ change: 'onFileChange',
+ afterrender: function (fileField) {
+ fileField.fileInputEl.set({
+ accept: '.gpx'
+ });
+ }
+ }
}, {
xtype: 'tbfill'
}, {