diff --git a/webapp/src/components/appContent.vue b/webapp/src/components/appContent.vue index 20def127..a220dcb9 100644 --- a/webapp/src/components/appContent.vue +++ b/webapp/src/components/appContent.vue @@ -351,9 +351,9 @@ export default { .catch(error => { this.modalError(error); // Let mixin handle error });*/ - return new Promise((resolve) => { - resolve({}); - }); + return new Promise(resolve => { + resolve({}); + }); }, setTab: function(event, tab) { if (!(this.currentTab == tab)) { diff --git a/webapp/src/components/genericComponents/multiNumericSettingLine.vue b/webapp/src/components/genericComponents/multiNumericSettingLine.vue index 4039b334..45a07b9e 100644 --- a/webapp/src/components/genericComponents/multiNumericSettingLine.vue +++ b/webapp/src/components/genericComponents/multiNumericSettingLine.vue @@ -4,10 +4,10 @@
- + @@ -109,7 +111,7 @@ methods: { } .numeric-setting-line-input { display: table-cell; - width:100%; + width: 100%; } .button-next-to-input { display: table-cell; diff --git a/webapp/src/components/genericComponents/numericArraySettingLine.vue b/webapp/src/components/genericComponents/numericArraySettingLine.vue index 348693d4..54ea22ae 100644 --- a/webapp/src/components/genericComponents/numericArraySettingLine.vue +++ b/webapp/src/components/genericComponents/numericArraySettingLine.vue @@ -4,10 +4,10 @@ - + @@ -112,10 +114,10 @@ methods: { width: 100%; } .numeric-setting-line-input { - flex-grow: 1; - margin-left: 5px; - margin-right: 5px; - width: 6em; + flex-grow: 1; + margin-left: 5px; + margin-right: 5px; + width: 6em; } .button-next-to-input { flex-grow: 0; diff --git a/webapp/src/components/genericComponents/numericSettingLine.vue b/webapp/src/components/genericComponents/numericSettingLine.vue index d06c55e6..a4c8d553 100644 --- a/webapp/src/components/genericComponents/numericSettingLine.vue +++ b/webapp/src/components/genericComponents/numericSettingLine.vue @@ -3,9 +3,9 @@ - + @@ -110,10 +112,10 @@ methods: { width: 100%; } .numeric-setting-line-input { - flex-grow: 1; - margin-left: 5px; - margin-right: 5px; - width: 6em; + flex-grow: 1; + margin-left: 5px; + margin-right: 5px; + width: 6em; } .button-next-to-input { flex-grow: 0; diff --git a/webapp/src/components/genericComponents/taskSubmitter.vue b/webapp/src/components/genericComponents/taskSubmitter.vue index 0c7ae4d2..ca316568 100644 --- a/webapp/src/components/genericComponents/taskSubmitter.vue +++ b/webapp/src/components/genericComponents/taskSubmitter.vue @@ -142,7 +142,10 @@ export default { if (task.status == "pending" || task.status == "running") { this.taskStarted = true; this.$emit("taskStarted", this.taskId); - this.startPolling(task.id, task.links.find(t => t.rel==self).href); + this.startPolling( + task.id, + task.links.find(t => t.rel == self).href + ); } } }); @@ -219,33 +222,32 @@ export default { var checkCondition = (resolve, reject) => { // If the condition is met, we're done! - axios.get( - this.taskUrl, - {baseURL: this.$store.getters.baseUri} - ).then(response => { - var result = response.data.status; - // If the task ends with success - if (result == "completed") { - resolve(response.data); - } - // If task ends with an error - else if (result == "error") { - // Pass the error string back with reject + axios + .get(this.taskUrl, { baseURL: this.$store.getters.baseUri }) + .then(response => { + var result = response.data.status; + // If the task ends with success + if (result == "completed") { + resolve(response.data); + } + // If task ends with an error + else if (result == "error") { + // Pass the error string back with reject - reject(new Error(response.data.output)); - } - // If task ends with termination - else if (result == "cancelled") { - // Pass a generic termination error back with reject + reject(new Error(response.data.output)); + } + // If task ends with termination + else if (result == "cancelled") { + // Pass a generic termination error back with reject - reject(new Error("Task cancelled")); - } else { - // Since the task is still running, we can update the progress bar - this.progress = response.data.progress; - // Check again after timeout - setTimeout(checkCondition, interval, resolve, reject); - } - }); + reject(new Error("Task cancelled")); + } else { + // Since the task is still running, we can update the progress bar + this.progress = response.data.progress; + // Check again after timeout + setTimeout(checkCondition, interval, resolve, reject); + } + }); }; return new Promise(checkCondition); diff --git a/webapp/src/components/tabContentComponents/captureComponents/paneCapture.vue b/webapp/src/components/tabContentComponents/captureComponents/paneCapture.vue index e1881c1c..7636ac00 100644 --- a/webapp/src/components/tabContentComponents/captureComponents/paneCapture.vue +++ b/webapp/src/components/tabContentComponents/captureComponents/paneCapture.vue @@ -221,7 +221,10 @@ -