hotfix: delay resolution closes #1041

logaretm · Dec 13, 2017 · 7b0f84a · 7b0f84a
1 parent eeb0ee6
commit 7b0f84a
Show file tree

Hide file tree

Showing 12 changed files with 82 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 [![codecov](https://codecov.io/gh/baianat/vee-validate/branch/master/graph/badge.svg)](https://codecov.io/gh/baianat/vee-validate)
 [![Build Status](https://travis-ci.org/baianat/vee-validate.svg?branch=master)](https://travis-ci.org/baianat/vee-validate)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/087bd788687c4ccab6650756ce56fa05)](https://www.codacy.com/app/baianat/vee-validate?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=baianat/vee-validate&amp;utm_campaign=Badge_Grade)
-[![CDNJS](https://img.shields.io/cdnjs/v/vee-validate.svg)](https://cdnjs.com/libraries/vee-validate/2.0.0-rc.26)
+[![CDNJS](https://img.shields.io/cdnjs/v/vee-validate.svg)](https://cdnjs.com/libraries/vee-validate/2.0.0-rc.27)
 [![npm](https://img.shields.io/npm/dm/vee-validate.svg)](https://npm-stat.com/charts.html?package=vee-validate)
 [![npm](https://img.shields.io/npm/v/vee-validate.svg)](https://www.npmjs.com/package/vee-validate)
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/baianat/vee-validate.svg)](http://isitmaintained.com/project/baianat/vee-validate "Average time to resolve an issue")

diff --git a/dist/vee-validate.esm.js b/dist/vee-validate.esm.js
@@ -1,5 +1,5 @@
 /**
-  * vee-validate v2.0.0-rc.26
+  * vee-validate v2.0.0-rc.27
   * (c) 2017 Abdelrahman Awad
   * @license MIT
   */
@@ -1179,7 +1179,13 @@ Generator.resolveDelay = function resolveDelay (el, vnode, options) {
     delay = vnode.child.$attrs['data-vv-delay'];
   }
 
-  return (delay) ? { local: { input: parseInt(delay) }, global: deepParseInt(globalDelay) } : { global: deepParseInt(globalDelay) };
+  if (!isObject(globalDelay)) {
+    return deepParseInt(delay || globalDelay);
+  }
+
+  globalDelay.input = delay || 0;
+
+  return deepParseInt(globalDelay);
 };
 
 /**
@@ -1377,7 +1383,7 @@ var Field = function Field (el, options) {
   this.rules = {};
   this._cacheId(options);
   options = assign({}, DEFAULT_OPTIONS, options);
-  this._delay = typeof options.delay === 'number' ? options.delay : (options.delay && options.delay.global); // cache initial delay
+  this._delay = !isNullOrUndefined(options.delay) ? options.delay : 0; // cache initial delay
   this.validity = options.validity;
   this.aria = options.aria;
   this.flags = createFlags();
@@ -2916,7 +2922,10 @@ function install (_Vue, options) {
     });
   }
 
-  Validator.localize(locale); // set the locale
+  if (!i18n) {
+    Validator.localize(locale); // set the locale
+  }
+
   Validator.setStrictMode(Config.current.strict);
 
   Vue.mixin(mixin);
@@ -6934,7 +6943,7 @@ var mapFields = function (fields) {
   }, {});
 };
 
-var version = '2.0.0-rc.26';
+var version = '2.0.0-rc.27';
 
 var rulesPlugin = function (ref) {
   var Validator$$1 = ref.Validator;

diff --git a/dist/vee-validate.js b/dist/vee-validate.js
@@ -1,5 +1,5 @@
 /**
-  * vee-validate v2.0.0-rc.26
+  * vee-validate v2.0.0-rc.27
   * (c) 2017 Abdelrahman Awad
   * @license MIT
   */
@@ -5068,7 +5068,13 @@ Generator.resolveDelay = function resolveDelay (el, vnode, options) {
     delay = vnode.child.$attrs['data-vv-delay'];
   }
 
-  return (delay) ? { local: { input: parseInt(delay) }, global: deepParseInt(globalDelay) } : { global: deepParseInt(globalDelay) };
+  if (!isObject(globalDelay)) {
+    return deepParseInt(delay || globalDelay);
+  }
+
+  globalDelay.input = delay || 0;
+
+  return deepParseInt(globalDelay);
 };
 
 /**
@@ -5266,7 +5272,7 @@ var Field = function Field (el, options) {
   this.rules = {};
   this._cacheId(options);
   options = assign({}, DEFAULT_OPTIONS, options);
-  this._delay = typeof options.delay === 'number' ? options.delay : (options.delay && options.delay.global); // cache initial delay
+  this._delay = !isNullOrUndefined(options.delay) ? options.delay : 0; // cache initial delay
   this.validity = options.validity;
   this.aria = options.aria;
   this.flags = createFlags();
@@ -6805,7 +6811,10 @@ function install (_Vue, options) {
     });
   }
 
-  Validator.localize(locale); // set the locale
+  if (!i18n) {
+    Validator.localize(locale); // set the locale
+  }
+
   Validator.setStrictMode(Config.current.strict);
 
   Vue.mixin(mixin);
@@ -6948,7 +6957,7 @@ var minimal$1 = {
   mapFields: mapFields,
   Validator: Validator,
   ErrorBag: ErrorBag,
-  version: '2.0.0-rc.26'
+  version: '2.0.0-rc.27'
 };
 
 // rules plugin definition.

diff --git a/dist/vee-validate.min.js b/dist/vee-validate.min.js
diff --git a/dist/vee-validate.minimal.esm.js b/dist/vee-validate.minimal.esm.js
@@ -1,5 +1,5 @@
 /**
-  * vee-validate v2.0.0-rc.26
+  * vee-validate v2.0.0-rc.27
   * (c) 2017 Abdelrahman Awad
   * @license MIT
   */
@@ -1179,7 +1179,13 @@ Generator.resolveDelay = function resolveDelay (el, vnode, options) {
     delay = vnode.child.$attrs['data-vv-delay'];
   }
 
-  return (delay) ? { local: { input: parseInt(delay) }, global: deepParseInt(globalDelay) } : { global: deepParseInt(globalDelay) };
+  if (!isObject(globalDelay)) {
+    return deepParseInt(delay || globalDelay);
+  }
+
+  globalDelay.input = delay || 0;
+
+  return deepParseInt(globalDelay);
 };
 
 /**
@@ -1377,7 +1383,7 @@ var Field = function Field (el, options) {
   this.rules = {};
   this._cacheId(options);
   options = assign({}, DEFAULT_OPTIONS, options);
-  this._delay = typeof options.delay === 'number' ? options.delay : (options.delay && options.delay.global); // cache initial delay
+  this._delay = !isNullOrUndefined(options.delay) ? options.delay : 0; // cache initial delay
   this.validity = options.validity;
   this.aria = options.aria;
   this.flags = createFlags();
@@ -2916,7 +2922,10 @@ function install (_Vue, options) {
     });
   }
 
-  Validator.localize(locale); // set the locale
+  if (!i18n) {
+    Validator.localize(locale); // set the locale
+  }
+
   Validator.setStrictMode(Config.current.strict);
 
   Vue.mixin(mixin);
@@ -3051,7 +3060,7 @@ var mapFields = function (fields) {
   }, {});
 };
 
-var version = '2.0.0-rc.26';
+var version = '2.0.0-rc.27';
 
 var index_minimal_esm = {
   install: install,

diff --git a/dist/vee-validate.minimal.js b/dist/vee-validate.minimal.js
@@ -1,5 +1,5 @@
 /**
-  * vee-validate v2.0.0-rc.26
+  * vee-validate v2.0.0-rc.27
   * (c) 2017 Abdelrahman Awad
   * @license MIT
   */
@@ -1185,7 +1185,13 @@ Generator.resolveDelay = function resolveDelay (el, vnode, options) {
     delay = vnode.child.$attrs['data-vv-delay'];
   }
 
-  return (delay) ? { local: { input: parseInt(delay) }, global: deepParseInt(globalDelay) } : { global: deepParseInt(globalDelay) };
+  if (!isObject(globalDelay)) {
+    return deepParseInt(delay || globalDelay);
+  }
+
+  globalDelay.input = delay || 0;
+
+  return deepParseInt(globalDelay);
 };
 
 /**
@@ -1383,7 +1389,7 @@ var Field = function Field (el, options) {
   this.rules = {};
   this._cacheId(options);
   options = assign({}, DEFAULT_OPTIONS, options);
-  this._delay = typeof options.delay === 'number' ? options.delay : (options.delay && options.delay.global); // cache initial delay
+  this._delay = !isNullOrUndefined(options.delay) ? options.delay : 0; // cache initial delay
   this.validity = options.validity;
   this.aria = options.aria;
   this.flags = createFlags();
@@ -2922,7 +2928,10 @@ function install (_Vue, options) {
     });
   }
 
-  Validator.localize(locale); // set the locale
+  if (!i18n) {
+    Validator.localize(locale); // set the locale
+  }
+
   Validator.setStrictMode(Config.current.strict);
 
   Vue.mixin(mixin);
@@ -3065,7 +3074,7 @@ var index_minimal = {
   mapFields: mapFields,
   Validator: Validator,
   ErrorBag: ErrorBag,
-  version: '2.0.0-rc.26'
+  version: '2.0.0-rc.27'
 };
 
 return index_minimal;

diff --git a/dist/vee-validate.minimal.min.js b/dist/vee-validate.minimal.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vee-validate",
-  "version": "2.0.0-rc.26",
+  "version": "2.0.0-rc.27",
   "description": "Simple Vue.js input validation plugin",
   "author": "Abdelrahman Awad <[email protected]>",
   "license": "MIT",

diff --git a/src/core/field.js b/src/core/field.js
@@ -71,6 +71,7 @@ export default class Field {
   model: ?string;
   value: any;
   _alias: ?string;
+  _delay: number | Object;
 
   constructor (el: HTMLInputElement | null, options: FieldOptions | MapObject = {}) {
     this.id = uniqId();
@@ -83,7 +84,7 @@ export default class Field {
     this.rules = {};
     this._cacheId(options);
     options = assign({}, DEFAULT_OPTIONS, options);
-    this._delay = typeof options.delay === 'number' ? options.delay : (options.delay && options.delay.global); // cache initial delay
+    this._delay = !isNullOrUndefined(options.delay) ? options.delay : 0; // cache initial delay
     this.validity = options.validity;
     this.aria = options.aria;
     this.flags = createFlags();

diff --git a/src/core/generator.js b/src/core/generator.js
@@ -113,7 +113,13 @@ export default class Generator {
       delay = vnode.child.$attrs['data-vv-delay'];
     }
 
-    return (delay) ? { local: { input: parseInt(delay) }, global: deepParseInt(globalDelay) } : { global: deepParseInt(globalDelay) };
+    if (!isObject(globalDelay)) {
+      return deepParseInt(delay || globalDelay);
+    }
+
+    globalDelay.input = delay || 0;
+
+    return deepParseInt(globalDelay);
   }
 
   /**

diff --git a/src/install.js b/src/install.js
@@ -27,7 +27,10 @@ function install (_Vue, options = {}) {
     });
   }
 
-  Validator.localize(locale); // set the locale
+  if (!i18n) {
+    Validator.localize(locale); // set the locale
+  }
+
   Validator.setStrictMode(Config.current.strict);
 
   Vue.mixin(mixin);

diff --git a/tests/core/generator.js b/tests/core/generator.js
@@ -72,11 +72,17 @@ test('resolves delay', () => {
   `;
   const vnode = { child: { $attrs: { 'data-vv-delay': '200' } } };
   let el = document.querySelector('#el');
-  expect(Generator.resolveDelay(el, {})).toEqual(expect.objectContaining({ local: { input: 100 } }));
+  expect(Generator.resolveDelay(el, {})).toBe(100);
+
+  // fills the delay object if the global delay is an object of events.
+  expect(Generator.resolveDelay(el, {}, { delay: { input: 300, blur: 300 } })).toEqual({
+    blur: 300,
+    input: 100
+  });
 
   el = { getAttribute: () => null };
-  expect(Generator.resolveDelay(el, vnode)).toEqual(expect.objectContaining({ local: { input: 200 } }));
-  expect(Generator.resolveDelay(el, {}, { delay: '300' })).toEqual({ global: 300 });
+  expect(Generator.resolveDelay(el, vnode)).toBe(200);
+  expect(Generator.resolveDelay(el, {}, { delay: '300' })).toBe(300);
 })
 
 test('resolves events', () => {