Merge branch 'develop' into feature/CSR-1112

This commit is contained in:
Leah Schumann 2023-04-14 15:49:28 -04:00
commit 96cb744a7c
2 changed files with 6 additions and 1 deletions

View file

@ -49,7 +49,7 @@ export default {
customDropdownId: String, customDropdownId: String,
}, },
setup(props) { setup(props) {
const dropdownId = !props.customInputId const dropdownId = !props.customDropdownId
? `dropdown-${crypto.randomUUID()}` ? `dropdown-${crypto.randomUUID()}`
: props.customDropdownId; : props.customDropdownId;

View file

@ -161,6 +161,11 @@ const routes = [
const router = createRouter({ const router = createRouter({
history: createWebHistory("/fmg/"), history: createWebHistory("/fmg/"),
routes, routes,
//Cause "page" to begin at the top when route chanages.
scrollBehavior(to, from, savedPosition) {
// always scroll to top
return { top: 0 };
},
}); });
//---------------------------------------------------------- Router Functions ---------------------------------------------------------- //---------------------------------------------------------- Router Functions ----------------------------------------------------------