Skip to content
Snippets Groups Projects
Commit 79a6e7ee authored by Robert Goldmann's avatar Robert Goldmann
Browse files

Fixed #708 - Add feedback on account select via keyboard

parent 44c44e37
Branches
Tags
No related merge requests found
...@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.WebRequest; import org.springframework.web.context.request.WebRequest;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.text.MessageFormat;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
...@@ -51,6 +52,8 @@ public class AccountController extends BaseController ...@@ -51,6 +52,8 @@ public class AccountController extends BaseController
public static final String GLOBAL_ACCOUNT_SELECT_MODAL = "globalAccountSelectModal"; public static final String GLOBAL_ACCOUNT_SELECT_MODAL = "globalAccountSelectModal";
} }
private static final String ACCOUNT_SELECTED_INDICATOR = "accountSelected=1";
private final AccountService accountService; private final AccountService accountService;
private final IconService iconService; private final IconService iconService;
...@@ -71,7 +74,15 @@ public class AccountController extends BaseController ...@@ -71,7 +74,15 @@ public class AccountController extends BaseController
{ {
return ReturnValues.SETTINGS; return ReturnValues.SETTINGS;
} }
return "redirect:" + referer;
if(referer.contains(ACCOUNT_SELECTED_INDICATOR))
{
return MessageFormat.format("redirect:{0}", referer);
}
else
{
return MessageFormat.format("redirect:{0}?{1}", referer, ACCOUNT_SELECTED_INDICATOR);
}
} }
@GetMapping(value = "/{ID}/setAsDefault") @GetMapping(value = "/{ID}/setAsDefault")
......
...@@ -324,10 +324,22 @@ input[type="radio"]:checked + span::after, [type="radio"].with-gap:checked + spa ...@@ -324,10 +324,22 @@ input[type="radio"]:checked + span::after, [type="radio"].with-gap:checked + spa
} }
#globalAccountSelect { #globalAccountSelect {
padding: 1rem 32px 1rem 32px; padding: 0.6rem 18px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
border: 0.4rem solid transparent;
}
#globalAccountSelect.active {
animation: blink 1s;
animation-iteration-count: 1;
}
@keyframes blink {
50% {
border-color: var(--color-text);
}
} }
#globalAccountSelect:hover { #globalAccountSelect:hover {
......
...@@ -64,6 +64,8 @@ $(document).ready(function() ...@@ -64,6 +64,8 @@ $(document).ready(function()
data: {} data: {}
}); });
}); });
checkUrlParameters();
}); });
function fetchAndShowModal(item, containerID, modalID) function fetchAndShowModal(item, containerID, modalID)
...@@ -140,3 +142,13 @@ function enableAccountSelectHotKeys() ...@@ -140,3 +142,13 @@ function enableAccountSelectHotKeys()
} }
}); });
} }
function checkUrlParameters()
{
const urlParameters = new URLSearchParams(window.location.search);
const isAccountSelect = urlParameters.get('accountSelected');
if(isAccountSelect !== null)
{
document.getElementById('globalAccountSelect').classList.add('active');
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment