:Merge branch 'Nicop06-master'

brvier · Mar 27, 2018 · 7656247 · 7656247
2 parents b79bb30 + eefbb5a
commit 7656247
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/platforms/android/assets/www/js/.controllers.js.swp b/platforms/android/assets/www/js/.controllers.js.swp
diff --git a/www/js/controllers.js b/www/js/controllers.js
@@ -1604,7 +1604,7 @@ angular
 
               window.resolveLocalFileSystemURL(
                 stordir,
-                function(dirEntry) {
+                function(dirEntry) { //noqa
                   $scope.exportAGPX(
                     dirEntry,
                     $scope.sessions[recclicked],

diff --git a/www/templates/settings.html b/www/templates/settings.html
@@ -188,7 +188,7 @@ <h4 class="positive">{{ "_options" | translate }}</h4>
 
 <div class="content double-padding">
     <h4 class="positive">{{ "_backup_and_restore" | translate }}</h4>
-  <button ng-click="exportAsGPX(true)" class="button icon-left ion-pin button-positive button-block">{{ "_export_as_gpx" | translate }}</button>
+  <button ng-click="exportGPXs(true)" class="button icon-left ion-pin button-positive button-block">{{ "_export_as_gpx" | translate }}</button>
   <!--<button ng-if="platform === 'Android'" onclick="document.getElementById('gpxFile').click();" class="button icon-left ion-pin button-positive button-block">{{ "_import_gpxs" | translate }}-->
  <!--</button>-->
   <!--<button ng-if="platform === 'iOS'" onclick="iosFilePicker();"