Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in / Register
Toggle navigation
Q
Quasar Components Shared
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
5
Issues
5
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Security & Compliance
Security & Compliance
Dependency List
Packages
Packages
List
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
Motion Bank
MB.js
Quasar Components Shared
Commits
9b50ff3c
Commit
9b50ff3c
authored
Jun 05, 2019
by
Anton Koch
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'shared-clean-up' into 'master'
shared: clean up and refactoring See merge request
!15
parents
aaa91365
2871f22d
Pipeline
#11984
passed with stage
in 8 minutes and 24 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
21 deletions
+12
-21
navigation/BreadcrumbNav.vue
navigation/BreadcrumbNav.vue
+0
-1
navigation/PageSubNav.vue
navigation/PageSubNav.vue
+0
-12
navigation/UserNav.vue
navigation/UserNav.vue
+12
-8
No files found.
navigation/BreadcrumbNav.vue
View file @
9b50ff3c
...
...
@@ -39,7 +39,6 @@
},
computed
:
{
breadcrumbs
()
{
console
.
log
(
'
route
'
,
this
.
$route
,
this
.
timeline
)
let
bc
=
[]
const
parts
=
this
.
$route
.
name
.
split
(
'
.
'
)
...
...
navigation/PageSubNav.vue
View file @
9b50ff3c
...
...
@@ -190,24 +190,12 @@
toProperCase
(
t
)
{
return
t
.
charAt
(
0
).
toUpperCase
()
+
t
.
substr
(
1
).
toLowerCase
()
},
// getButtons () {
// if (this.type in this.buttons) {
// return this.buttons[this.type]
// }
// else return undefined
// },
getConfig
()
{
if
(
this
.
type
in
this
.
config
)
{
return
this
.
config
[
this
.
type
]
}
else
return
undefined
}
// getSpecialFunctions (config) {
// if (this.$route.name in config.specialFunctions) {
// return config.specialFunctions[this.$route.name]
// }
// else return undefined
// }
}
}
</
script
>
...
...
navigation/UserNav.vue
View file @
9b50ff3c
...
...
@@ -279,6 +279,16 @@
'
piecemaker.timelines.show
'
,
'
piecemaker.videos.list
'
,
'
piecemaker.videos.create
'
],
video
:
[
'
piecemaker.videos.annotate
'
,
'
piecemaker.videos.edit
'
,
'
piecemaker.videos.sync
'
],
mosys
:
[
'
mosys.grids.annotate
'
,
'
mosys.grids.show
'
,
'
mosys.grids.edit
'
]
},
activeUserButtons
:
[],
...
...
@@ -391,10 +401,7 @@
}
// video
if
(
route
.
name
===
'
piecemaker.videos.annotate
'
||
route
.
name
===
'
piecemaker.videos.edit
'
||
route
.
name
===
'
piecemaker.videos.sync
'
)
{
if
(
this
.
routes
.
video
.
includes
(
route
.
name
))
{
this
.
currentId
.
video
=
route
.
params
.
uuid
this
.
getVideo
()
}
...
...
@@ -403,10 +410,7 @@
}
// grid
if
(
route
.
name
===
'
mosys.grids.annotate
'
||
route
.
name
===
'
mosys.grids.show
'
||
route
.
name
===
'
mosys.grids.edit
'
)
{
if
(
this
.
routes
.
mosys
.
includes
(
route
.
name
))
{
this
.
currentId
.
grid
=
route
.
params
.
uuid
this
.
getGrid
()
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment