Merge pull request #35253 from nextcloud/bugfix/noid/remove-warnings-…

…loginpage
nextcloud · Nov 18, 2022 · 4767551 · 4767551
2 parents b4ab2a9 + 4083a50
commit 4767551
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/core/src/components/MainMenu.js b/core/src/components/MainMenu.js
@@ -28,15 +28,21 @@ import Vue from 'vue'
 import AppMenu from './AppMenu.vue'
 
 export const setUp = () => {
+
 	Vue.mixin({
 		methods: {
 			t,
 			n,
 		},
 	})
 
+	const container = document.getElementById('header-left__appmenu')
+	if (!container) {
+		// no container, possibly we're on a public page
+		return
+	}
 	const AppMenuApp = Vue.extend(AppMenu)
-	const appMenu = new AppMenuApp({}).$mount('#header-left__appmenu')
+	const appMenu = new AppMenuApp({}).$mount(container)
 
 	Object.assign(OC, {
 		setNavigationCounter(id, counter) {

diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue
@@ -168,7 +168,7 @@ export default {
 	computed: {
 		isError() {
 			return this.invalidPassword || this.userDisabled
-				|| (this.throttleDelay && this.throttleDelay > 5000)
+				|| this.throttleDelay > 5000
 		},
 		errorLabel() {
 			if (this.invalidPassword) {
@@ -177,7 +177,7 @@ export default {
 			if (this.userDisabled) {
 				return t('core', 'User disabled')
 			}
-			if (this.throttleDelay && this.throttleDelay > 5000) {
+			if (this.throttleDelay > 5000) {
 				return t('core', 'We have detected multiple invalid login attempts from your IP. Therefore your next login is throttled up to 30 seconds.')
 			}
 			return undefined

diff --git a/dist/core-login.js b/dist/core-login.js
diff --git a/dist/core-login.js.map b/dist/core-login.js.map
diff --git a/dist/core-main.js b/dist/core-main.js
diff --git a/dist/core-main.js.map b/dist/core-main.js.map