Merge pull request opentripplanner#4380 from realCity/feature/street-…

…notes debug-client: display street notes
entur · Aug 17, 2022 · 91244ab · 91244ab
2 parents 7230b83 + 1e05cc5
commit 91244ab
Showing 1 changed file with 27 additions and 28 deletions.
diff --git a/src/client/js/otp/modules/planner/ItinerariesWidget.js b/src/client/js/otp/modules/planner/ItinerariesWidget.js
@@ -601,10 +601,10 @@ otp.widgets.ItinerariesWidget =
                     headsign>. Used in showing itinerary*/
                     headerHtml +=  pgettext("bus_direction", " to ") + leg.headsign;
                 }
+            }
 
-                if(leg.alerts) {
-                    headerHtml += '&nbsp;&nbsp;<img src="images/alert.png" style="vertical-align: -20%;" />';
-                }
+            if (leg.alerts) {
+                headerHtml += '&nbsp;&nbsp;<img src="images/alert.png" style="vertical-align: -20%;" />';
             }
 
             $("<h3>"+headerHtml+"</h3>").appendTo(legDiv).data('leg', leg).hover(function(evt) {
@@ -943,31 +943,6 @@ otp.widgets.ItinerariesWidget =
                     this_.module.stopViewerWidget.bringToFront();
                 });
 
-            // render any alerts
-
-            if(leg.alerts) {
-                for(var i = 0; i < leg.alerts.length; i++) {
-                    var alert = leg.alerts[i];
-
-                    var alertDiv = ich['otp-planner-alert']({ alert: alert, leg: leg }).appendTo(legDiv);
-                    alertDiv.find('.otp-itin-alert-description').hide();
-
-                    alertDiv.find('.otp-itin-alert-toggleButton').data('div', alertDiv).click(function() {
-                        var div = $(this).data('div');
-                        var desc = div.find('.otp-itin-alert-description');
-                        var toggle = div.find('.otp-itin-alert-toggleButton');
-                        if(desc.is(":visible")) {
-                            desc.slideUp();
-                            toggle.html("&#x25BC;");
-                        }
-                        else {
-                            desc.slideDown();
-                            toggle.html("&#x25B2;");
-                        }
-                    });
-                }
-            }
-
             return legDiv;
         }
         else if (leg.steps) { // walk / bike / car
@@ -1012,6 +987,30 @@ otp.widgets.ItinerariesWidget =
                     });
                 }
             }
+
+            // render any alerts
+            if(leg.alerts) {
+                for(var i = 0; i < leg.alerts.length; i++) {
+                    var alert = leg.alerts[i];
+
+                    var alertDiv = ich['otp-planner-alert']({ alert: alert, leg: leg }).appendTo(legDiv);
+                    alertDiv.find('.otp-itin-alert-description').hide();
+
+                    alertDiv.find('.otp-itin-alert-toggleButton').data('div', alertDiv).click(function() {
+                        var div = $(this).data('div');
+                        var desc = div.find('.otp-itin-alert-description');
+                        var toggle = div.find('.otp-itin-alert-toggleButton');
+                        if(desc.is(":visible")) {
+                            desc.slideUp();
+                            toggle.html("&#x25BC;");
+                        }
+                        else {
+                            desc.slideDown();
+                            toggle.html("&#x25B2;");
+                        }
+                    });
+                }
+            }
             return legDiv;
         }
         return $("<div>Leg details go here</div>");