Commit 9b50ff3c authored by Anton Koch's avatar Anton Koch

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
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
}, },
computed: { computed: {
breadcrumbs () { breadcrumbs () {
console.log('route', this.$route, this.timeline)
let bc = [] let bc = []
const parts = this.$route.name.split('.') const parts = this.$route.name.split('.')
......
...@@ -190,24 +190,12 @@ ...@@ -190,24 +190,12 @@
toProperCase (t) { toProperCase (t) {
return t.charAt(0).toUpperCase() + t.substr(1).toLowerCase() 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 () { getConfig () {
if (this.type in this.config) { if (this.type in this.config) {
return this.config[this.type] return this.config[this.type]
} }
else return undefined else return undefined
} }
// getSpecialFunctions (config) {
// if (this.$route.name in config.specialFunctions) {
// return config.specialFunctions[this.$route.name]
// }
// else return undefined
// }
} }
} }
</script> </script>
......
...@@ -279,6 +279,16 @@ ...@@ -279,6 +279,16 @@
'piecemaker.timelines.show', 'piecemaker.timelines.show',
'piecemaker.videos.list', 'piecemaker.videos.list',
'piecemaker.videos.create' 'piecemaker.videos.create'
],
video: [
'piecemaker.videos.annotate',
'piecemaker.videos.edit',
'piecemaker.videos.sync'
],
mosys: [
'mosys.grids.annotate',
'mosys.grids.show',
'mosys.grids.edit'
] ]
}, },
activeUserButtons: [], activeUserButtons: [],
...@@ -391,10 +401,7 @@ ...@@ -391,10 +401,7 @@
} }
// video // video
if (route.name === 'piecemaker.videos.annotate' || if (this.routes.video.includes(route.name)) {
route.name === 'piecemaker.videos.edit' ||
route.name === 'piecemaker.videos.sync'
) {
this.currentId.video = route.params.uuid this.currentId.video = route.params.uuid
this.getVideo() this.getVideo()
} }
...@@ -403,10 +410,7 @@ ...@@ -403,10 +410,7 @@
} }
// grid // grid
if (route.name === 'mosys.grids.annotate' || if (this.routes.mosys.includes(route.name)) {
route.name === 'mosys.grids.show' ||
route.name === 'mosys.grids.edit'
) {
this.currentId.grid = route.params.uuid this.currentId.grid = route.params.uuid
this.getGrid() this.getGrid()
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment