From 14fd7103ef6fb3c4401e016b73292ec2c635d105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szekeres=20Ba=CC=81lint?= Date: Sun, 6 Jan 2019 17:17:42 +0100 Subject: [PATCH] isRoot() checks --- public/assets/js/app.js | 8 ++++---- public/index.html | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/assets/js/app.js b/public/assets/js/app.js index 475a5cb..11cfdfa 100644 --- a/public/assets/js/app.js +++ b/public/assets/js/app.js @@ -854,19 +854,19 @@ }; $scope.isIndexHTML = function(site) { - return getSiteValue(site, 'index') === 'index.html' || !$scope.isPHP(site); + return $scope.isRoot() && (getSiteValue(site, 'index') === 'index.html' || !$scope.isPHP(site)); }; $scope.isIndexPHP = function(site) { - return $scope.isPHP(site) && getSiteValue(site, 'index') === 'index.php'; + return $scope.isRoot() && getSiteValue(site, 'index') === 'index.php' && $scope.isPHP(site); }; $scope.isFallbackHTML = function(site) { - return getSiteValue(site, 'fallback_html'); + return $scope.isRoot() && getSiteValue(site, 'fallback_html'); }; $scope.isFallbackPHP = function(site) { - return getSiteValue(site, 'fallback_php') && $scope.isPHP(site); + return $scope.isRoot() && getSiteValue(site, 'fallback_php') && $scope.isPHP(site); }; diff --git a/public/index.html b/public/index.html index b90149a..e943461 100644 --- a/public/index.html +++ b/public/index.html @@ -476,7 +476,7 @@ -
+
index @@ -493,7 +493,7 @@
-
+
Fallback routing