Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
SiB Router
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
19
Issues
19
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Startin blox
framework
SiB Router
Compare Revisions
v0.7.4...v0.7.5
Source
v0.7.5
Select Git revision
...
Target
v0.7.4
Select Git revision
Compare
Commits (3)
update: display default route for /
· d6771be1
Matthieu Fesselier
authored
Jul 26, 2019
d6771be1
bugfix: add id
· 10b509ea
Matthieu Fesselier
authored
Jul 29, 2019
10b509ea
Merge branch 'update/33-default-route-root' into 'master'
· 10df3422
Clément
authored
Aug 05, 2019
update: default route on /
#33
Closes
#33
See merge request
!27
10df3422
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
7 deletions
+13
-7
src/sib-route.js
src/sib-route.js
+3
-2
src/sib-router.js
src/sib-router.js
+10
-5
No files found.
src/sib-route.js
View file @
10df3422
...
...
@@ -55,9 +55,9 @@ export default class SIBRoute extends HTMLElement {
.
replace
(
/^@/
,
''
);
}
getPath
(
prefix
,
name
,
id
=
''
)
{
getPath
(
prefix
,
name
,
id
=
''
,
isDefaultRoute
=
false
)
{
const
encodedId
=
this
.
encodeId
(
id
);
return
[
prefix
,
name
,
encodedId
].
filter
(
s
=>
s
).
join
(
'
/
'
);
return
[
prefix
,
isDefaultRoute
?
''
:
name
,
encodedId
].
filter
(
s
=>
s
).
join
(
'
/
'
);
}
updateResource
(
id
=
null
)
{
const
resourceId
=
id
||
this
.
resourceId
;
...
...
@@ -76,6 +76,7 @@ export default class SIBRoute extends HTMLElement {
this
.
router
.
prefix
,
this
.
name
,
id
||
this
.
resourceId
,
this
.
router
.
defaultRoute
==
this
.
name
// is current route default route?
);
router
.
setAttribute
(
'
route-prefix
'
,
routePrefix
);
router
.
display
();
...
...
src/sib-router.js
View file @
10df3422
...
...
@@ -32,7 +32,9 @@ export default class SIBRouter extends HTMLElement {
return
stripSlashes
(
url
);
}
get
currentRouteName
()
{
return
this
.
currentURL
.
split
(
'
/
'
)[
0
]
||
this
.
defaultRoute
;
const
currentURL
=
this
.
currentURL
.
split
(
'
/
'
)[
0
];
const
isInRouter
=
Array
.
from
(
this
.
routes
).
some
(
route
=>
route
.
name
==
currentURL
)
// is currentURL in current routes?
return
!
isInRouter
||
!
currentURL
?
this
.
defaultRoute
:
currentURL
;
// if url not in current routes, the url belongs to a subrouter -> return default route
}
get
routes
()
{
return
this
.
querySelectorAll
(
'
sib-route
'
);
...
...
@@ -77,14 +79,17 @@ export default class SIBRouter extends HTMLElement {
});
}
const
id
=
resource
?
resource
[
'
@id
'
]
:
null
;
const
path
=
route
.
getPath
(
this
.
prefix
,
routeName
,
route
.
hasAttribute
(
'
use-id
'
)
?
id
:
''
);
if
(
!
keepURL
)
{
//update current URL
const
prefix
=
this
.
useHash
?
'
#
'
:
'
/
'
;
history
.
pushState
({},
routeName
,
prefix
+
path
);
this
.
updateURL
(
route
,
id
)
}
this
.
display
(
routeName
,
id
,
keepURL
);
}
updateURL
(
route
,
id
)
{
const
path
=
route
.
getPath
(
this
.
prefix
,
route
.
name
,
route
.
hasAttribute
(
'
use-id
'
)
?
id
:
''
,
route
.
name
==
this
.
defaultRoute
);
const
prefix
=
this
.
useHash
?
'
#
'
:
'
/
'
;
history
.
pushState
({},
route
.
name
,
prefix
+
path
);
// update current URL
}
}
if
(
!
customElements
.
get
(
'
sib-router
'
))
{
...
...