Merge pull request #792 from nextcloud/nextcloud-vue-1.2.8

Update @nextcloud/vue and dev dependencies

4 files changed, 20 insertions, 19 deletions

diff --git a/package.json b/package.json
index f595782a..5eae2b28 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
 		"@babel/runtime": "^7.8.3",
 		"@nextcloud/axios": "^1.3.1",
 		"@nextcloud/router": "^1.0.0",
-		"@nextcloud/vue": "^1.2.7",
+		"@nextcloud/vue": "^1.3.0",
 		"acorn": "^7.1.0",
 		"acorn-jsx": "^5.1.0",
 		"babel-plugin-transform-async-to-generator": "^6.24.1",
@@ -87,8 +87,8 @@
 		"raw-loader": "^4.0.0",
 		"sass-loader": "^8.0.2",
 		"stylelint": "^12.0.1",
-		"stylelint-config-recommended-scss": "^4.0.0",
-		"stylelint-scss": "^3.13.0",
+		"stylelint-config-recommended-scss": "^4.2.0",
+		"stylelint-scss": "^3.14.2",
 		"vue-loader": "^15.7.2",
 		"vue-style-loader": "^4.1.1",
 		"vue-template-compiler": "^2.6.10",
diff --git a/src/js/components/Base/LoadingOverlay.vue b/src/js/components/Base/LoadingOverlay.vue
index 48fab117..e6db7e2b 100644
--- a/src/js/components/Base/LoadingOverlay.vue
+++ b/src/js/components/Base/LoadingOverlay.vue
@@ -34,14 +34,14 @@ export default {
 
 <style lang="scss">
 .loading-overlay {
-	position: absolute;
+	position: fixed;
 	left: 0;
 	top: 0;
 	width: 100%;
 	height: 100%;
 	background: #fff;
 	opacity: 0.9;
-	z-index: 1001;
+	z-index: 9999;
 	.icon-loading {
 		position: fixed;
 		left: 50%;
diff --git a/src/js/components/SideBar/SideBar.vue b/src/js/components/SideBar/SideBar.vue
index 0fed5bd6..a9a6817f 100644
--- a/src/js/components/SideBar/SideBar.vue
+++ b/src/js/components/SideBar/SideBar.vue
@@ -23,22 +23,23 @@
 <template>
 	<AppSidebar ref="sideBar" :active="active" :title="t('polls', 'Details')"
 		@close="$emit('closeSideBar')">
-		<AppSidebarTab v-if="acl.allowEdit" :order="1" :name="t('polls', 'Configuration')"
-			icon="icon-settings">
+		<AppSidebarTab v-if="acl.allowEdit" :id="'configuration'" :order="1"
+			:name="t('polls', 'Configuration')" icon="icon-settings">
 			<SideBarTabConfiguration />
 		</AppSidebarTab>
 
-		<AppSidebarTab v-if="acl.allowEdit" :order="2" :name="t('polls', 'Options')"
-			icon="icon-toggle-filelist">
+		<AppSidebarTab v-if="acl.allowEdit" :id="'options'" :order="2"
+			:name="t('polls', 'Options')" icon="icon-toggle-filelist">
 			<SideBarTabOptions />
 		</AppSidebarTab>
 
-		<AppSidebarTab v-if="acl.allowEdit" :order="3" :name="t('polls', 'Shares')"
-			icon="icon-share">
+		<AppSidebarTab v-if="acl.allowEdit" :id="'shares'" :order="3"
+			:name="t('polls', 'Shares')" icon="icon-share">
 			<SideBarTabShare />
 		</AppSidebarTab>
 
-		<AppSidebarTab :order="4" :name="t('polls', 'Comments')" icon="icon-comment">
+		<AppSidebarTab :id="'comments'" :order="4" :name="t('polls', 'Comments')"
+			icon="icon-comment">
 			<Comments />
 		</AppSidebarTab>
 	</AppSidebar>
diff --git a/src/js/views/Vote.vue b/src/js/views/Vote.vue
index 8cd15a92..0ec92827 100644
--- a/src/js/views/Vote.vue
+++ b/src/js/views/Vote.vue
@@ -38,10 +38,10 @@
 			<VoteTable v-show="tableMode && options.list.length" />
 			<div v-if="!options.list.length" class="emptycontent">
 				<div class="icon-toggle-filelist" />
-				<button v-if="acl.getAllowEdit" @click="openOptions">
+				<button v-if="acl.allowEdit" @click="openOptions">
 					{{ t('polls', 'There are no vote options, add some in the options section of the right side bar.') }}
 				</button>
-				<div v-if="!acl.getAllowEdit">
+				<div v-if="!acl.allowEdit">
 					{{ t('polls', 'There are no vote options. Maybe the owner did not provide some until now.') }}
 				</div>
 			</div>
@@ -52,7 +52,7 @@
 			</div>
 		</div>
 
-		<SideBar v-if="sideBarOpen" :active="activeTab" @closeSideBar="toggleSideBar" />
+		<SideBar v-if="sideBarOpen && !isLoading" :active="activeTab" @closeSideBar="toggleSideBar" />
 		<LoadingOverlay v-if="isLoading" />
 	</AppContent>
 </template>
@@ -92,10 +92,10 @@ export default {
 			voteSaved: false,
 			delay: 50,
 			sideBarOpen: true,
-			isLoading: false,
+			isLoading: true,
 			initialTab: 'comments',
 			tableMode: true,
-			activeTab: t('polls', 'Comments').toLowerCase()
+			activeTab: 'comments'
 		}
 	},
 
@@ -125,12 +125,12 @@ export default {
 	methods: {
 		openOptions() {
 			this.sideBarOpen = true
-			this.activeTab = t('polls', 'Options').toLowerCase()
+			this.activeTab = 'options'
 		},
 
 		openConfiguration() {
 			this.sideBarOpen = true
-			this.activeTab = t('polls', 'Configuration').toLowerCase()
+			this.activeTab = 'configuration'
 		},
 
 		loadPoll() {