Merge pull request epicmaxco#25 from someburner/someburner-namespace-fix

fixed epicmaxco#21 namespace fix
renato04 · Sep 20, 2017 · 54ebec0 · 54ebec0
2 parents c15e6f9 + 0eed3c3
commit 54ebec0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/components/dashboard/setup-profile-tab/SetupProfileTab.vue b/src/components/dashboard/setup-profile-tab/SetupProfileTab.vue
@@ -110,8 +110,8 @@
     methods: {
       isFormFieldValid (field) {
         let isValid = false
-        if (this.fields[field]) {
-          isValid = this.fields[field].validated && this.fields[field].valid
+        if (this.formFields[field]) {
+          isValid = this.formFields[field].validated && this.formFields[field].valid
         }
         return isValid
       },

diff --git a/src/components/forms/form-elements/FormElements.vue b/src/components/forms/form-elements/FormElements.vue
@@ -285,8 +285,9 @@
     computed: {
       isSuccessfulEmailValid () {
         let isValid = false
-        if (this.fields.successfulEmail) {
-          isValid = this.fields.successfulEmail.validated && this.fields.successfulEmail.valid
+        if (
+        .successfulEmail) {
+          isValid = this.formFields.successfulEmail.validated && this.formFields.successfulEmail.valid
         }
         return isValid
       }

diff --git a/src/components/forms/form-wizard/FormWizard.vue b/src/components/forms/form-wizard/FormWizard.vue
@@ -368,8 +368,8 @@
     methods: {
       isFormFieldValid (field) {
         let isValid = false
-        if (this.fields[field]) {
-          isValid = this.fields[field].validated && this.fields[field].valid
+        if (this.formFields[field]) {
+          isValid = this.formFields[field].validated && this.formFields[field].valid
         }
         return isValid
       },

diff --git a/src/main.js b/src/main.js
@@ -11,7 +11,9 @@ import VuesticPlugin from 'src/components/vuestic-components/vuestic-components-
 
 Vue.use(VuesticPlugin)
 Vue.use(BootstrapVue)
-Vue.use(VeeValidate)
+
+// NOTE: workaround for VeeValidate + vuetable-2
+Vue.use(VeeValidate, {fieldsBagName: 'formFields'})
 
 sync(store, router)