diff --git a/src/api/voicebox.js b/src/api/voicebox.js index fd52a42b..347a4074 100644 --- a/src/api/voicebox.js +++ b/src/api/voicebox.js @@ -92,11 +92,12 @@ export function deleteVoiceboxGreetingById(id) { }); } -export function createNewGreeting(formData, onProgress) { +export function createNewGreeting(formData, onProgress, type) { return new Promise((resolve, reject) => { + let requestKey = `previous${_.capitalize(type)}Request`; Vue.http.post('api/voicemailgreetings/', formData, { before(request) { - Vue.previousRequest = request; + Vue[requestKey] = request; }, progress(e) { if (e.lengthComputable) { @@ -124,13 +125,13 @@ export function uploadGreeting(options) { Promise.resolve().then(() => { return getVoiceboxGreetingByType({ id: options.data.subscriber_id, - type: options.data.type + type: options.data.dir }); }).then((greetings) => { if (_.some(greetings.items, { dir: options.data.dir })) { deleteVoiceboxGreetingById(greetings.items[0].id); } - return createNewGreeting(formData, options.onProgress); + return createNewGreeting(formData, options.onProgress, options.data.dir); }).then(() => { resolve(); }).catch((err) => { @@ -139,6 +140,7 @@ export function uploadGreeting(options) { }); } -export function abortPreviousRequest() { - Vue.previousRequest.abort(); +export function abortPreviousRequest(name) { + let requestKey = `previous${_.capitalize(name)}Request`; + Vue[requestKey].abort(); } diff --git a/src/components/form/CscSoundFileUpload.vue b/src/components/form/CscSoundFileUpload.vue index 88e66d3c..e167b48d 100644 --- a/src/components/form/CscSoundFileUpload.vue +++ b/src/components/form/CscSoundFileUpload.vue @@ -11,6 +11,7 @@ /> @import '../../themes/quasar.variables'; + .csc-file-upload-actions padding-top $flex-gutter-xs + .csc-upload-field + margin-bottom 40px + .q-field-icon color $primary + .csc-upload-progress-field margin 10px 0 5px 0 @@ -169,4 +175,5 @@ .upload-progress height 20px + diff --git a/src/components/form/CscUploadFile.vue b/src/components/form/CscUploadFile.vue deleted file mode 100644 index 2d8a80a8..00000000 --- a/src/components/form/CscUploadFile.vue +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - diff --git a/src/components/pages/Voicebox/Voicebox.vue b/src/components/pages/Voicebox/Voicebox.vue index d719716d..191b9474 100644 --- a/src/components/pages/Voicebox/Voicebox.vue +++ b/src/components/pages/Voicebox/Voicebox.vue @@ -19,63 +19,32 @@ :deleteLabel="deleteLabel" :attachLabel="attachLabel" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -84,8 +53,6 @@