Merge pull request #21829 from nextcloud/bugfix/noid/fix-login-form-e…

…rors Fix login form erors
nextcloud · Jul 15, 2020 · b327b4f · b327b4f
2 parents 91df865 + d5b85e5
commit b327b4f
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 14 deletions.
diff --git a/core/js/dist/install.js b/core/js/dist/install.js
diff --git a/core/js/dist/install.js.map b/core/js/dist/install.js.map
diff --git a/core/js/dist/login.js b/core/js/dist/login.js
diff --git a/core/js/dist/login.js.map b/core/js/dist/login.js.map
diff --git a/core/js/dist/main.js b/core/js/dist/main.js
diff --git a/core/js/dist/main.js.map b/core/js/dist/main.js.map
diff --git a/core/js/dist/maintenance.js b/core/js/dist/maintenance.js
diff --git a/core/js/dist/maintenance.js.map b/core/js/dist/maintenance.js.map
diff --git a/core/js/dist/recommendedapps.js b/core/js/dist/recommendedapps.js
diff --git a/core/js/dist/recommendedapps.js.map b/core/js/dist/recommendedapps.js.map
diff --git a/core/src/components/login/LoginForm.vue b/core/src/components/login/LoginForm.vue
@@ -23,7 +23,7 @@
  <form ref="loginForm"
  method="post"
  name="login"
- :action="OC.generateUrl('login')"
+ :action="loginActionUrl"
  @submit="submit">
  <fieldset>
  <div v-if="apacheAuthFailed"
@@ -47,7 +47,7 @@
  class="hidden">
  <img class="float-spinner"
  alt=""
- :src="OC.imagePath('core', 'loading-dark.gif')">
+ :src="loadingIcon">
  <span id="messageText" />
  <!-- the following div ensures that the spinner is always inside the #message div -->
  <div style="clear: both;" />
@@ -65,7 +65,7 @@
  :aria-label="t('core', 'Username or email')"
  required
  @change="updateUsername">
- <label for="user" class="infield">{{ t('core', 'Username or email') }}</label>
+ <label for="user" class="infield">{{ t('core', 'Username or email') }}</label>
  </p>
 
  <p class="groupbottom"
@@ -82,7 +82,7 @@
  <label for="password"
  class="infield">{{ t('Password') }}</label>
  <a href="#" class="toggle-password" @click.stop.prevent="togglePassword">
- <img :src="OC.imagePath('core', 'actions/toggle.svg')">
+ <img :src="toggleIcon">
  </a>
  </p>
 
@@ -126,6 +126,10 @@
 <script>
 import jstz from 'jstimezonedetect'
 import LoginButton from './LoginButton'
+import {
+ generateUrl,
+ imagePath,
+} from '@nextcloud/router'
 
 export default {
  name: 'LoginForm',
@@ -185,6 +189,15 @@ export default {
  userDisabled() {
  return this.errors.indexOf('userdisabled') !== -1
  },
+ toggleIcon() {
+ return imagePath('core', 'actions/toggle.svg')
+ },
+ loadingIcon() {
+ return imagePath('core', 'loading-dark.gif')
+ },
+ loginActionUrl() {
+ return generateUrl('login')
+ },
  },
  mounted() {
  if (this.username === '') {