diff --git a/assets/index.html b/assets/index.html
index 31f4cab4..a0922521 100644
--- a/assets/index.html
+++ b/assets/index.html
@@ -21,11 +21,10 @@
-
- <% for (var chunk of webpack.chunks) {
+ <% for (var chunk of webpack.compilation.chunks) {
for (var file of chunk.files) {
if (file.match(/\.(js|css)$/)) { %>
- <% }}} %>
+ <% }}} %>
diff --git a/assets/src/components/Files.vue b/assets/src/components/Files.vue
index 38924647..d36b07e7 100644
--- a/assets/src/components/Files.vue
+++ b/assets/src/components/Files.vue
@@ -152,25 +152,19 @@ export default {
if (url[0] !== '/') url = '/' + url
api.fetch(url)
- .then((req) => {
- if (!url.endsWith('/') && req.url.endsWith('/')) {
- window.history.replaceState(window.history.state, document.title, window.location.pathname + '/')
- }
+ .then((req) => {
+ if (!url.endsWith('/') && req.url.endsWith('/')) {
+ window.history.replaceState(window.history.state, document.title, window.location.pathname + '/')
+ }
- this.$store.commit('updateRequest', req)
- document.title = req.name
- this.setLoading(false)
- })
- .catch(error => {
- this.setLoading(false)
-
- if (typeof error === 'object') {
- this.error = error.status
- return
- }
-
- this.error = error
- })
+ this.$store.commit('updateRequest', req)
+ document.title = req.name
+ this.setLoading(false)
+ })
+ .catch(error => {
+ this.setLoading(false)
+ this.error = error
+ })
},
keyEvent (event) {
// Esc!
@@ -220,7 +214,6 @@ export default {
if (this.req.kind !== 'editor') {
document.getElementById('download-button').click()
- return
}
}
}
diff --git a/assets/src/router/index.js b/assets/src/router/index.js
index 74e24481..f990afb8 100644
--- a/assets/src/router/index.js
+++ b/assets/src/router/index.js
@@ -25,13 +25,13 @@ const router = new Router({
component: Login,
beforeEnter: function (to, from, next) {
auth.loggedIn()
- .then(() => {
- next({ path: '/files' })
- })
- .catch(() => {
- document.title = 'Login'
- next()
- })
+ .then(() => {
+ next({ path: '/files' })
+ })
+ .catch(() => {
+ document.title = 'Login'
+ next()
+ })
}
},
{
diff --git a/assets/src/utils/api.js b/assets/src/utils/api.js
index e9b74f48..f908404e 100644
--- a/assets/src/utils/api.js
+++ b/assets/src/utils/api.js
@@ -24,10 +24,7 @@ function fetch (url) {
resolve(JSON.parse(request.responseText))
break
default:
- reject({
- message: request.responseText,
- status: request.status
- })
+ reject(new Error(request.status))
break
}
}
diff --git a/assets/src/utils/auth.js b/assets/src/utils/auth.js
index bc25b343..cde1de92 100644
--- a/assets/src/utils/auth.js
+++ b/assets/src/utils/auth.js
@@ -23,10 +23,10 @@ function loggedIn () {
parseToken(request.responseText)
resolve()
} else {
- reject()
+ reject(new Error(request.responseText))
}
}
- request.onerror = () => reject()
+ request.onerror = () => reject(new Error('Could not finish the request'))
request.send()
})
}
@@ -45,7 +45,7 @@ function login (user, password) {
reject(request.responseText)
}
}
- request.onerror = () => reject()
+ request.onerror = () => reject(new Error('Could not finish the request'))
request.send(JSON.stringify(data))
})
}