Browse Source

Merge remote-tracking branch 'origin/polishing' into owen

Owen Diffey 4 years ago
parent
commit
8b7a45a61b

+ 3 - 1
frontend/src/components/Confirm.vue

@@ -53,7 +53,9 @@ export default {
 
 			this.clickedOnce = false;
 			this.$emit("confirm");
-			this.$refs.confirm.tippy.hide();
+			setTimeout(() => {
+				this.$refs.confirm.tippy.hide();
+			}, 25);
 		},
 		click(event) {
 			if (!this.clickedOnce) this.clickedOnce = true;

+ 3 - 0
frontend/src/components/modals/EditPlaylist/Tabs/Settings.vue

@@ -81,6 +81,9 @@ export default {
 					this.userRole === "admin")
 			);
 		},
+		isAdmin() {
+			return this.userRole === "admin";
+		},
 		renamePlaylist() {
 			const { displayName } = this.playlist;
 			if (!validation.isLength(displayName, 2, 32))