Bladeren bron

fix(ResetPassword): when going from login modal, musare icon fails to load

Signed-off-by: Jonathan <theflametrooper@gmail.com>
Jonathan 3 jaren geleden
bovenliggende
commit
20772abcef

+ 0 - 3
frontend/src/App.vue

@@ -171,9 +171,6 @@ export default {
 		);
 	},
 	methods: {
-		submitOnEnter: (cb, event) => {
-			if (event.which === 13) cb();
-		},
 		enableNightMode: () => {
 			document
 				.getElementsByTagName("body")[0]

+ 5 - 6
frontend/src/components/modals/Login.vue

@@ -23,9 +23,7 @@
 								class="input"
 								type="email"
 								placeholder="Email..."
-								@keypress="
-									$parent.submitOnEnter(submitModal, $event)
-								"
+								@keypress="submitOnEnter(submitModal, $event)"
 							/>
 						</p>
 
@@ -41,9 +39,7 @@
 								type="password"
 								ref="password"
 								placeholder="Password..."
-								@keypress="
-									$parent.submitOnEnter(submitModal, $event)
-								"
+								@keypress="submitOnEnter(submitModal, $event)"
 							/>
 							<a @click="togglePasswordVisibility()">
 								<i class="material-icons">
@@ -147,6 +143,9 @@ export default {
 		if (this.$route.path === "/login") this.isPage = true;
 	},
 	methods: {
+		submitOnEnter: (cb, event) => {
+			if (event.which === 13) cb();
+		},
 		submitModal() {
 			this.login({
 				email: this.email,

+ 6 - 3
frontend/src/components/modals/Register.vue

@@ -23,7 +23,7 @@
 							placeholder="Email..."
 							@keypress="
 								onInput('email') &
-									$parent.submitOnEnter(submitModal, $event)
+									submitOnEnter(submitModal, $event)
 							"
 							@paste="onInput('email')"
 							autofocus
@@ -47,7 +47,7 @@
 							placeholder="Username..."
 							@keypress="
 								onInput('username') &
-									$parent.submitOnEnter(submitModal, $event)
+									submitOnEnter(submitModal, $event)
 							"
 							@paste="onInput('username')"
 						/>
@@ -74,7 +74,7 @@
 							placeholder="Password..."
 							@keypress="
 								onInput('password') &
-									$parent.submitOnEnter(submitModal, $event)
+									submitOnEnter(submitModal, $event)
 							"
 							@paste="onInput('password')"
 						/>
@@ -272,6 +272,9 @@ export default {
 		});
 	},
 	methods: {
+		submitOnEnter: (cb, event) => {
+			if (event.which === 13) cb();
+		},
 		togglePasswordVisibility() {
 			if (this.$refs.password.type === "password") {
 				this.$refs.password.type = "text";

+ 6 - 0
frontend/src/pages/ResetPassword.vue

@@ -321,6 +321,8 @@ export default {
 	},
 	watch: {
 		"email.value": function watchEmail(value) {
+			if (!value) return;
+
 			if (
 				value.indexOf("@") !== value.lastIndexOf("@") ||
 				!validation.regex.emailSimple.test(value)
@@ -333,6 +335,8 @@ export default {
 			}
 		},
 		"password.value": function watchPassword(value) {
+			if (!value) return;
+
 			this.checkPasswordMatch(value, this.passwordAgain.value);
 
 			if (!validation.isLength(value, 6, 200)) {
@@ -349,6 +353,8 @@ export default {
 			}
 		},
 		"passwordAgain.value": function watchPasswordAgain(value) {
+			if (!value) return;
+
 			this.checkPasswordMatch(this.password.value, value);
 		}
 	},