Merge branch 'master' of github.com:budibase/budibase into test-api-unification
This commit is contained in:
commit
4a2f688456
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"version": "2.20.12",
|
"version": "2.20.13",
|
||||||
"npmClient": "yarn",
|
"npmClient": "yarn",
|
||||||
"packages": [
|
"packages": [
|
||||||
"packages/*",
|
"packages/*",
|
||||||
|
|
|
@ -69,11 +69,12 @@
|
||||||
// brought back to the same screen.
|
// brought back to the same screen.
|
||||||
const topItemNavigate = path => () => {
|
const topItemNavigate = path => () => {
|
||||||
const activeTopNav = $layout.children.find(c => $isActive(c.path))
|
const activeTopNav = $layout.children.find(c => $isActive(c.path))
|
||||||
if (!activeTopNav) return
|
if (activeTopNav) {
|
||||||
builderStore.setPreviousTopNavPath(
|
builderStore.setPreviousTopNavPath(
|
||||||
activeTopNav.path,
|
activeTopNav.path,
|
||||||
window.location.pathname
|
window.location.pathname
|
||||||
)
|
)
|
||||||
|
}
|
||||||
$goto($builderStore.previousTopNavPath[path] || path)
|
$goto($builderStore.previousTopNavPath[path] || path)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue