From ab0866b57ef29b002baa62fa34c2b0ba36ed94a3 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Mon, 2 Aug 2021 08:07:15 +0100 Subject: [PATCH] Avoid opening tabs when navigating away from page Fixes a long-standing mini bug that creates little javascript console errors. Also stops pointless requests being sent to the server. --- .../darkswarm/controllers/hub_node_controller.js.coffee | 2 ++ .../darkswarm/controllers/producer_node_controller.js.coffee | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee index 4f1d935aec..5f9862dd50 100644 --- a/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/hub_node_controller.js.coffee @@ -9,6 +9,8 @@ Darkswarm.controller "HubNodeCtrl", ($scope, HashNavigation, CurrentHub, $http, # Toggles shopfront tabs open/closed. Fetches enterprise details from the api, diplays them and adds them # to $scope.enterprise_details, or simply displays the details again if previously fetched $scope.toggle = (event) -> + return if event.target.closest("a") + if $scope.open() $scope.toggle_tab(event) return diff --git a/app/assets/javascripts/darkswarm/controllers/producer_node_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/producer_node_controller.js.coffee index 230592a7a6..6639a2398c 100644 --- a/app/assets/javascripts/darkswarm/controllers/producer_node_controller.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/producer_node_controller.js.coffee @@ -9,6 +9,8 @@ Darkswarm.controller "ProducerNodeCtrl", ($scope, HashNavigation, $anchorScroll, # Toggles shopfront tabs open/closed. Fetches enterprise details from the api, diplays them and adds them # to $scope.enterprise_details, or simply displays the details again if previously fetched $scope.toggle = (event) -> + return if event.target.closest("a") + if $scope.open() $scope.toggle_tab(event) return