From 4401a128ce2ba881525e67173c80407e0949d97c Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Tue, 4 Jul 2017 18:08:42 +0100
Subject: [PATCH] Fix Upload and remove last part of button animation.
Former-commit-id: 3f427b6f34b0a9498c883a15fce396c14640f8f0 [formerly 514a1adf5ff43ba73bb9b13c59d4089b3a72c639] [formerly f0ebafb4fc9b6067ec6c95c881b2652dd2df00f8 [formerly 973d4380df79d1139f0644eb45b3fd6a0ff3f4af]]
Former-commit-id: 02698fd8f45ce1b5c8d9b3b21bc85ccd42e63b11 [formerly 5eb200cf02ae14d57e14e024ee798fe5dad87a3c]
Former-commit-id: 835d7ed9789dc51311f0c943f3f8f7f01398e26d
---
_assets/src/components/Listing.vue | 3 ++-
_assets/src/components/prompts/Delete.vue | 6 ++++--
_assets/src/components/prompts/Move.vue | 4 +++-
_assets/src/utils/api.js | 4 ++--
_assets/src/utils/buttons.js | 21 +++------------------
5 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/_assets/src/components/Listing.vue b/_assets/src/components/Listing.vue
index 5e468e0c..a0a9ddb7 100644
--- a/_assets/src/components/Listing.vue
+++ b/_assets/src/components/Listing.vue
@@ -173,7 +173,8 @@ export default {
this.$store.commit('setReload', true)
})
.catch(e => {
- buttons.done('upload', false)
+ buttons.done('upload')
+ // TODO: show error in box
console.log(e)
})
diff --git a/_assets/src/components/prompts/Delete.vue b/_assets/src/components/prompts/Delete.vue
index 1a6d5658..35a04f8a 100644
--- a/_assets/src/components/prompts/Delete.vue
+++ b/_assets/src/components/prompts/Delete.vue
@@ -35,7 +35,8 @@ export default {
this.$router.push({path: url.removeLastDir(this.$route.path) + '/'})
})
.catch(error => {
- buttons.done('delete', false)
+ buttons.done('delete')
+ // TODO: show error in prompt
console.log(error)
})
@@ -61,7 +62,8 @@ export default {
.catch(error => {
console.log(error)
this.$store.commit('setReload', true)
- buttons.done('delete', false)
+ buttons.done('delete')
+ // TODO: show error in prompt
})
}
}
diff --git a/_assets/src/components/prompts/Move.vue b/_assets/src/components/prompts/Move.vue
index 1f19e707..8f5a0f2f 100644
--- a/_assets/src/components/prompts/Move.vue
+++ b/_assets/src/components/prompts/Move.vue
@@ -20,6 +20,7 @@
import { mapState } from 'vuex'
import url from '@/utils/url'
import api from '@/utils/api'
+import buttons from '@/utils/buttons'
export default {
name: 'move',
@@ -81,7 +82,8 @@ export default {
this.$router.push({page: dest})
})
.catch(e => {
- buttons.done('move', false)
+ buttons.done('move')
+ // TODO: show error in prompt
console.log(e)
})
},
diff --git a/_assets/src/utils/api.js b/_assets/src/utils/api.js
index 735358d2..7185fd36 100644
--- a/_assets/src/utils/api.js
+++ b/_assets/src/utils/api.js
@@ -57,7 +57,7 @@ function rm (url) {
})
}
-function put (url) {
+function put (url, content = '') {
url = removePrefix(url)
return new Promise((resolve, reject) => {
@@ -74,7 +74,7 @@ function put (url) {
}
request.onerror = (error) => reject(error)
- request.send()
+ request.send(content)
})
}
diff --git a/_assets/src/utils/buttons.js b/_assets/src/utils/buttons.js
index 46797ac2..2fb366ed 100644
--- a/_assets/src/utils/buttons.js
+++ b/_assets/src/utils/buttons.js
@@ -26,26 +26,11 @@ function done (button, success = true) {
el.style.opacity = 0
- let third = () => {
- el.innerHTML = el.dataset.icon
- el.style.opacity = null
- }
-
- let second = () => {
- el.style.opacity = 0
- setTimeout(third, 200)
- }
-
- let first = () => {
+ setTimeout(() => {
el.classList.remove('spin')
- el.innerHTML = success
- ? 'done'
- : 'close'
+ el.innerHTML = el.dataset.icon
el.style.opacity = 1
- setTimeout(second, 200)
- }
-
- setTimeout(first, 200)
+ }, 200)
}
export default {