From 5a9b5660f196ab86227f3d1dccdfeac8de58dd7a Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Wed, 18 Mar 2020 09:31:28 +1100 Subject: [PATCH] Simplify logic in PageSelectionCtrl --- .../controllers/page_selection_ctrl.js.coffee | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/darkswarm/controllers/page_selection_ctrl.js.coffee b/app/assets/javascripts/darkswarm/controllers/page_selection_ctrl.js.coffee index cb2515ec7a..9f4cbe2c1b 100644 --- a/app/assets/javascripts/darkswarm/controllers/page_selection_ctrl.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/page_selection_ctrl.js.coffee @@ -3,14 +3,14 @@ Darkswarm.controller "PageSelectionCtrl", ($scope, $location) -> # The path looks like `/contact` for the URL `https://ofn.org/shop#/contact`. # We remove the slash at the beginning. page = $location.path()[1..] - if page in $scope.whitelist - $scope.lastPage = page - page - else if page - # The path points to an unrelated path like `/login`. Stay where we were. - $scope.lastPage - else - $scope.whitelist[0] + + return $scope.whitelist[0] unless page + + # If the path points to an unrelated path like `/login`, stay where we were. + return $scope.lastPage unless page in $scope.whitelist + + $scope.lastPage = page + page $scope.whitelistPages = (pages) -> $scope.whitelist = pages