Skip to content
Snippets Groups Projects
Commit c589589c authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'reformat-vue' into 'master'

Reformat Vue code

See merge request !1167
parents f1ab2811 13c266d6
No related branches found
No related tags found
1 merge request!1167Reformat Vue code
Pipeline #110709 failed
......@@ -78,8 +78,12 @@ export default {
this.$root.$setPageTitle(title);
// Adapt height of IFrame according to the height of its contents once and listen to resize events
this.iFrameHeight = this.$refs.contentIFrame.contentDocument.body.scrollHeight;
this.$refs.contentIFrame.contentWindow.onresize = () => {this.iFrameHeight = this.$refs.contentIFrame.contentDocument.body.scrollHeight};
this.iFrameHeight =
this.$refs.contentIFrame.contentDocument.body.scrollHeight;
this.$refs.contentIFrame.contentWindow.onresize = () => {
this.iFrameHeight =
this.$refs.contentIFrame.contentDocument.body.scrollHeight;
};
this.$root.contentLoading = false;
},
......
......@@ -86,7 +86,9 @@
<router-view
v-if="
!$route.meta.permission || checkPermission($route.meta.permission) || $route.name === 'dashboard'
!$route.meta.permission ||
checkPermission($route.meta.permission) ||
$route.name === 'dashboard'
"
/>
<error-page
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment