feat(validations): support validation result resetting

Closes #136
kazupon · Jan 24, 2016 · a66909f · a66909f
1 parent 924837f
commit a66909f
Show file tree

Hide file tree

Showing 7 changed files with 393 additions and 77 deletions.
diff --git a/src/validations/base.js b/src/validations/base.js
@@ -19,18 +19,9 @@ export default class BaseValidation {
     this._el = el
     this._forScope = scope
     this._init = this._getValue(el)
-    this._value = el.value
     this._validators = {}
   }
 
-  _getValue (el) {
-    return el.value
-  }
-
-  _getScope () {
-    return this._forScope || this._vm
-  }
-
   manageElement (el) {
     const _ = util.Vue.util
 
@@ -39,7 +30,6 @@ export default class BaseValidation {
     if (model) {
       el.value = scope.$get(model) || ''
       this._unwatch = scope.$watch(model, _.bind((val, old) => {
-        console.log('BaseValidation#manageElement $watch', model, val, old)
         if (val !== old) {
           this.handleValidate(el)
         }
@@ -89,10 +79,6 @@ export default class BaseValidation {
     this._validator.validate()
   }
 
-  _checkModified (target) {
-    return this._init !== this._getValue(target)
-  }
-
   validate () {
     const _ = util.Vue.util
 
@@ -153,6 +139,29 @@ export default class BaseValidation {
     return results
   }
 
+  resetFlags () {
+    this.touched = false
+    this.dirty = false
+    this.modified = false
+  }
+
+  reset () {
+    this.resetFlags()
+    this._init = this._getValue(this._el)
+  }
+
+  _getValue (el) {
+    return el.value
+  }
+
+  _getScope () {
+    return this._forScope || this._vm
+  }
+
+  _checkModified (target) {
+    return this._init !== this._getValue(target)
+  }
+
   _fireEvent (el, valid) {
     trigger(el, valid ? 'valid' : 'invalid')
   }

diff --git a/src/validations/checkbox.js b/src/validations/checkbox.js
@@ -14,25 +14,6 @@ export default class CheckboxValidation extends BaseValidation {
     this._inits = []
   }
 
-  _addItem (el) {
-    let item = {
-      el: el,
-      init: el.checked,
-      value: el.value
-    }
-    this._inits.push(item)
-    return item
-  }
-
-  _setChecked (values, el) {
-    for (let i = 0, l = values.length; i < l; i++) {
-      let value = values[i]
-      if (!el.disabled && el.value === value && !el.checked) {
-        el.checked = true
-      }
-    }
-  }
-
   manageElement (el) {
     const _ = util.Vue.util
 
@@ -82,6 +63,33 @@ export default class CheckboxValidation extends BaseValidation {
     this._validator.validate()
   }
 
+  reset () {
+    this.resetFlags()
+    each(this._inits, (item, index) => {
+      item.init = item.el.checked
+      item.value = item.el.value
+    })
+  }
+
+  _addItem (el) {
+    let item = {
+      el: el,
+      init: el.checked,
+      value: el.value
+    }
+    this._inits.push(item)
+    return item
+  }
+
+  _setChecked (values, el) {
+    for (let i = 0, l = values.length; i < l; i++) {
+      let value = values[i]
+      if (!el.disabled && el.value === value && !el.checked) {
+        el.checked = true
+      }
+    }
+  }
+
   _getValue (el) {
     if (!this._inits || this._inits.length === 0) {
       return el.checked

diff --git a/src/validations/radio.js b/src/validations/radio.js
@@ -14,25 +14,6 @@ export default class RadioValidation extends BaseValidation {
     this._inits = []
   }
 
-  _addItem (el) {
-    let item = {
-      el: el,
-      init: el.checked,
-      value: el.value
-    }
-    this._inits.push(item)
-    return item
-  }
-
-  _setChecked (value, el, item) {
-    if (el.value === value) {
-      el.checked = true
-      this._init = el.checked
-      item.init = el.checked
-      item.value = value
-    }
-  }
-
   manageElement (el) {
     const _ = util.Vue.util
 
@@ -65,6 +46,33 @@ export default class RadioValidation extends BaseValidation {
     this._validator.validate()
   }
 
+  reset () {
+    this.resetFlags()
+    each(this._inits, (item, index) => {
+      item.init = item.el.checked
+      item.value = item.el.value
+    })
+  }
+
+  _addItem (el) {
+    let item = {
+      el: el,
+      init: el.checked,
+      value: el.value
+    }
+    this._inits.push(item)
+    return item
+  }
+
+  _setChecked (value, el, item) {
+    if (el.value === value) {
+      el.checked = true
+      this._init = el.checked
+      item.init = el.checked
+      item.value = value
+    }
+  }
+
   _getValue (el) {
     if (!this._inits || this._inits.length === 0) {
       return el.checked

diff --git a/src/validations/select.js b/src/validations/select.js
@@ -14,6 +14,35 @@ export default class SelectValidation extends BaseValidation {
     this._multiple = this._el.hasAttribute('multiple')
   }
 
+  manageElement (el) {
+    const _ = util.Vue.util
+
+    let scope = this._getScope()
+    let model = this._model
+    if (model) {
+      let value = scope.$get(model)
+      let values = !Array.isArray(value) ? [value] : value
+      this._setOption(values, el)
+      this._unwatch = scope.$watch(model, _.bind((val, old) => {
+        let values1 = !Array.isArray(val) ? [val] : val
+        let values2 = !Array.isArray(old) ? [old] : old
+        if (values1.slice().sort().toString() !== values2.slice().sort().toString()) {
+          this.handleValidate(el)
+        }
+      }, this))
+    }
+  }
+
+  unmanageElement (el) {
+    if (this._unwatch) {
+      this._unwatch()
+    }
+  }
+
+  reset () {
+    this.resetFlags()
+  }
+
   _getValue (el) {
     let ret = []
 
@@ -40,31 +69,6 @@ export default class SelectValidation extends BaseValidation {
     }
   }
 
-  manageElement (el) {
-    const _ = util.Vue.util
-
-    let scope = this._getScope()
-    let model = this._model
-    if (model) {
-      let value = scope.$get(model)
-      let values = !Array.isArray(value) ? [value] : value
-      this._setOption(values, el)
-      this._unwatch = scope.$watch(model, _.bind((val, old) => {
-        let values1 = !Array.isArray(val) ? [val] : val
-        let values2 = !Array.isArray(old) ? [old] : old
-        if (values1.slice().sort().toString() !== values2.slice().sort().toString()) {
-          this.handleValidate(el)
-        }
-      }, this))
-    }
-  }
-
-  unmanageElement (el) {
-    if (this._unwatch) {
-      this._unwatch()
-    }
-  }
-
   _checkModified (target) {
     let values = this._getValue(target).slice().sort()
     if (this._init.length !== values.length) {

diff --git a/src/validator.js b/src/validator.js
@@ -30,13 +30,34 @@ export default class Validator {
   enableReactive () {
     util.Vue.util.defineReactive(this._dir.vm, this.name, this._scope)
     this._dir.vm._validatorMaps[this.name] = this
+
+    this._dir.vm.$validatorReset = util.Vue.util.bind(() => {
+      this.resetValidation()
+    }, this)
   }
 
   disableReactive () {
+    this._dir.vm.$validatorReset = null
     this._dir.vm._validatorMaps[this.name] = null
     this._dir.vm[this.name] = null
   }
 
+  resetValidation () {
+    each(this._validations, (validation, key) => {
+      validation.reset()
+    }, this)
+
+    each(this._checkboxValidations, (dataset, key) => {
+      dataset.validation.reset()
+    }, this)
+
+    each(this._radioValidations, (dataset, key) => {
+      dataset.validation.reset()
+    }, this)
+
+    this.validate()
+  }
+
   // TODO: should be improved performance (use cache)
   get validations () {
     const extend = util.Vue.util.extend

diff --git a/test/specs/index.js b/test/specs/index.js
@@ -27,3 +27,4 @@ require('./lazy')
 require('./checkbox')
 require('./radio')
 require('./select')
+require('./reset')