Merge branch 'devel'

tmuguet · Oct 3, 2017 · ae82823 · ae82823
2 parents 7b131d2 + 820de8b
commit ae82823
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 12 deletions.
diff --git a/index.html b/index.html
@@ -15,7 +15,6 @@
     <link rel="apple-touch-icon-precomposed" href="ico/logo-medium-57.png">
 
     <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
-    <link rel="stylesheet" href="css/map2gpx.min.css" />
 
     <script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"></script>
 
@@ -79,6 +78,8 @@
 
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tether-drop/1.4.2/css/drop-theme-arrows.min.css" integrity="sha256-/QPHkS0U/zX5IkcTHsRU2AMYUq7fi4fwPWqRBXF+WSQ=" crossorigin="anonymous" />
     <script src="https://cdnjs.cloudflare.com/ajax/libs/tether-drop/1.4.2/js/drop.min.js" integrity="sha256-JCUUk3sUBrBY4l7yTK/BLKRZSC8DTHo25st8OlfjO8g=" crossorigin="anonymous"></script>
+
+    <link rel="stylesheet" href="css/map2gpx.min.css" />
 </head>
 
 <body>

diff --git a/js/map2gpx.babel.js b/js/map2gpx.babel.js
@@ -1025,9 +1025,10 @@ L.GeoJSON.include({
                     });
 
                     var current = marker;
-                    while (current && current.getType() != 'step' && current.hasRouteToHere()) {
+                    while (current && current.hasRouteToHere()) {
                         current.getRouteToHere().setPopupContentWith(current._previousMarker.getColorCode(), local);
                         current = current._previousMarker;
+                        if (current.getType() == 'step') break;
                     }
 
                     local = _this._initStats();
@@ -1070,9 +1071,10 @@ L.GeoJSON.include({
 
             if (local.distance > 0) {
                 var current = $.Track.getLastMarker();
-                while (current && current.getType() != 'step' && current.hasRouteToHere()) {
+                while (current && current.hasRouteToHere()) {
                     current.getRouteToHere().setPopupContentWith(current._previousMarker.getColorCode(), local);
                     current = current._previousMarker;
+                    if (current.getType() == 'step') break;
                 }
             }
 
@@ -2004,7 +2006,7 @@ window.onload = function () {
                                                 marker.setOpacity(1);
                                             });
 
-                                            $btn.attr('disabled', 'disabled');
+                                            $btn.removeAttr('disabled');
                                             importPopup.remove();
 
                                             $.State.triggerMarkersChanged();

diff --git a/js/map2gpx.min.js b/js/map2gpx.min.js
diff --git a/js/map2gpx.src.js b/js/map2gpx.src.js
@@ -1093,9 +1093,11 @@ L.GeoJSON.include({
                     });
 
                     var current = marker;
-                    while (current && current.getType() != 'step' && current.hasRouteToHere()) {
+                    while (current && current.hasRouteToHere()) {
                         current.getRouteToHere().setPopupContentWith(current._previousMarker.getColorCode(), local);
                         current = current._previousMarker;
+                        if (current.getType() == 'step')
+                            break;
                     }
 
                     local = _this._initStats();
@@ -1138,9 +1140,11 @@ L.GeoJSON.include({
 
             if (local.distance > 0) {
                 var current = $.Track.getLastMarker();
-                while (current && current.getType() != 'step' && current.hasRouteToHere()) {
+                while (current && current.hasRouteToHere()) {
                     current.getRouteToHere().setPopupContentWith(current._previousMarker.getColorCode(), local);
                     current = current._previousMarker;
+                    if (current.getType() == 'step')
+                        break;
                 }
             }
 
@@ -2092,7 +2096,7 @@ window.onload = function () {
                                                     marker.setOpacity(1);
                                                 });
 
-                                                $btn.attr('disabled', 'disabled');
+                                                $btn.removeAttr('disabled');
                                                 importPopup.remove();
 
                                                 $.State.triggerMarkersChanged();

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "map2gpx",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "map2gpx is a web application that lets you trace paths on maps (for hiking for instance) and export them to GPX or KML formats.\\n",
   "main": "n/a",
   "private": true,

diff --git a/src/js/chart.js b/src/js/chart.js
@@ -308,9 +308,11 @@
                     });
 
                     var current = marker;
-                    while (current && current.getType() != 'step' && current.hasRouteToHere()) {
+                    while (current && current.hasRouteToHere()) {
                         current.getRouteToHere().setPopupContentWith(current._previousMarker.getColorCode(), local);
                         current = current._previousMarker;
+                        if (current.getType() == 'step')
+                            break;
                     }
 
                     local = _this._initStats();
@@ -353,9 +355,11 @@
 
             if (local.distance > 0) {
                 var current = $.Track.getLastMarker();
-                while (current && current.getType() != 'step' && current.hasRouteToHere()) {
+                while (current && current.hasRouteToHere()) {
                     current.getRouteToHere().setPopupContentWith(current._previousMarker.getColorCode(), local);
                     current = current._previousMarker;
+                    if (current.getType() == 'step')
+                        break;
                 }
             }
 

diff --git a/src/js/script.js b/src/js/script.js
@@ -345,7 +345,7 @@ window.onload = function () {
                                                     marker.setOpacity(1);
                                                 });
 
-                                                $btn.attr('disabled', 'disabled');
+                                                $btn.removeAttr('disabled');
                                                 importPopup.remove();
 
                                                 $.State.triggerMarkersChanged();