Use generateUrl and imagePath instead of OC.*

Signed-off-by: Joas Schilling <coding@schilljs.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
nextcloud · Jul 14, 2020 · e96ace7 · e96ace7
1 parent 59bcc5f
commit e96ace7
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 8 deletions.
diff --git a/core/js/dist/install.js b/core/js/dist/install.js
diff --git a/core/js/dist/login.js b/core/js/dist/login.js
diff --git a/core/js/dist/main.js b/core/js/dist/main.js
diff --git a/core/js/dist/maintenance.js b/core/js/dist/maintenance.js
diff --git a/core/js/dist/recommendedapps.js b/core/js/dist/recommendedapps.js
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;" />
@@ -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 === '') {