From f2fd07c0e38b4b4b4f5a044ab4b4d234e4fc332e Mon Sep 17 00:00:00 2001 From: Curtis Cummings Date: Thu, 22 Sep 2016 16:30:10 -0400 Subject: [PATCH] Upgrading to can 3.0. Adding equality operator fix from #36. --- can-validate/can-validate.js | 18 +++---- can-validate/demo.html | 25 +++++----- can-validate/map/validate/demo.html | 19 ++++---- can-validate/map/validate/validate.js | 49 +++++++++++--------- can-validate/map/validate/validate.test.js | 11 +++-- can-validate/shims/validatejs.shim.js | 11 +++-- can-validate/shims/validatejs.test.js | 6 +-- can-validate/shims/validations.shim.js | 7 ++- can-validate/shims/validations.test.js | 5 +- can-validate/validate.test.js | 14 +++--- can-validate/validations/validations.js | 8 ++-- can-validate/validations/validations.test.js | 4 +- package.json | 13 +++++- 13 files changed, 107 insertions(+), 83 deletions(-) diff --git a/can-validate/can-validate.js b/can-validate/can-validate.js index b505f02a..9aa219e0 100644 --- a/can-validate/can-validate.js +++ b/can-validate/can-validate.js @@ -34,10 +34,12 @@ * */ -import can from 'can'; +import ns from 'can-util/namespace'; +import Construct from 'can-construct'; +import canDev from 'can-util/js/dev/'; // add methods to can -var Validate = can.Construct.extend({ +var Validate = Construct.extend({ /* * @description The current validator ID to use when can.validate methods are called. @@ -96,7 +98,7 @@ var Validate = can.Construct.extend({ isValid: function () { //!steal-remove-start if (!this._validatorId) { - can.dev.warn('A validator library is required for can.validate to work properly.'); + canDev.warn('A validator library is required for can.validate to work properly.'); } //!steal-remove-end return this.validator().isValid.apply(this, arguments); @@ -118,7 +120,7 @@ var Validate = can.Construct.extend({ once: function () { //!steal-remove-start if (!this._validatorId) { - can.dev.warn('A validator library is required for can.validate to work properly.'); + canDev.warn('A validator library is required for can.validate to work properly.'); } //!steal-remove-end return this.validator().once.apply(this, arguments); @@ -139,16 +141,16 @@ var Validate = can.Construct.extend({ var validateArgs = arguments; //!steal-remove-start if (!this._validatorId) { - can.dev.warn('A validator library is required for can.validate to work properly.'); + canDev.warn('A validator library is required for can.validate to work properly.'); } if (typeof arguments[0] !== 'object') { - can.dev.warn('Attempting to pass single value to validate, use can.validator.once instead.'); + canDev.warn('Attempting to pass single value to validate, use can.validator.once instead.'); } //!steal-remove-end return this.validator().validate.apply(this, validateArgs); } }, {}); -can.validate = Validate; +ns.validate = Validate; -export default can; +export default Validate; diff --git a/can-validate/demo.html b/can-validate/demo.html index 7b2eb885..5b7f7953 100644 --- a/can-validate/demo.html +++ b/can-validate/demo.html @@ -13,7 +13,7 @@
- +
+