From c4611a2500a9daa1b7cf8671ecfb3eb3ff193031 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 7 Mar 2019 18:34:13 +0000 Subject: [PATCH] --- ayanova/src/api/errorhandler.js | 2 +- ayanova/src/api/locale.js | 9 ++------- ayanova/src/components/inventorywidgetlist.vue | 2 +- ayanova/src/views/inventory.vue | 3 ++- ayanova/src/views/log.vue | 3 +-- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/ayanova/src/api/errorhandler.js b/ayanova/src/api/errorhandler.js index 72377519..e0f8b7fa 100644 --- a/ayanova/src/api/errorhandler.js +++ b/ayanova/src/api/errorhandler.js @@ -1,4 +1,4 @@ -/* eslint-disable */ +/* Xeslint-disable */ import store from "../store"; var devModeShowErrors = false; diff --git a/ayanova/src/api/locale.js b/ayanova/src/api/locale.js index b071073b..99ba878b 100644 --- a/ayanova/src/api/locale.js +++ b/ayanova/src/api/locale.js @@ -1,4 +1,4 @@ -/* xeslint-disable */ +/* ZZeslint-disable */ import store from "../store"; import apiUtil from "./apiutil"; import _ from "../libs/lodash.min.js"; @@ -22,9 +22,7 @@ export default { needIt.push(keys[i]); } } - if (keys[0] == "Log") { - throw new Error("TEST ERROR IN LOCALE"); - } + if (needIt.length == 0) { resolve(); return; @@ -41,9 +39,6 @@ export default { resolve(); }); - // .catch(function(error) { - // reject(error); - // }); }); }, //Keys that all edit forms have in common (saves retyping them over and over) diff --git a/ayanova/src/components/inventorywidgetlist.vue b/ayanova/src/components/inventorywidgetlist.vue index 9c307119..4847603a 100644 --- a/ayanova/src/components/inventorywidgetlist.vue +++ b/ayanova/src/components/inventorywidgetlist.vue @@ -77,7 +77,7 @@ export default { .then(() => (this.formReady = true)) .catch(err => { this.formReady = true; //show the form anyway so we know what's what - throw err; + this.$gzerror(err); }); }, data() { diff --git a/ayanova/src/views/inventory.vue b/ayanova/src/views/inventory.vue index dc581457..8df10233 100644 --- a/ayanova/src/views/inventory.vue +++ b/ayanova/src/views/inventory.vue @@ -43,7 +43,8 @@ export default { .fetch(["Inventory"]) .then(() => (this.formReady = true)) .catch(err => { - throw err; + this.formReady = true; + this.$gzerror(err); }); }, components: { diff --git a/ayanova/src/views/log.vue b/ayanova/src/views/log.vue index d81ebb13..10e02374 100644 --- a/ayanova/src/views/log.vue +++ b/ayanova/src/views/log.vue @@ -8,7 +8,7 @@