taking changes from #36

canjs · Sep 22, 2016 · 0bdf1ef · 0bdf1ef
1 parent b98fb39
commit 0bdf1ef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/can-validate/map/validate/validate.js b/can-validate/map/validate/validate.js
@@ -239,16 +239,17 @@ deepAssign(canMap.prototype, {
 	*
 	* @param {object} item A key/value object
 	* @param {object} opts Object that contains validation config.
+  +	@param {object} otherItems Object that contains other attributes in the map
 	* @return {boolean} True if method found that the property can be saved; if
 	*  validation fails and the property must validate (`mustValidate` property),
 	*  this will be `false`.
 	*/
-	_validateOne: function (item, opts) {
+	_validateOne: function (item, opts, otherItems) {
 		var errors;
 		var allowSet = true;
 
 		// run validation
-		errors = canValidate.once(item.value, deepAssign({}, opts), item.key);
+		errors = canValidate.once(item.value, deepAssign({}, opts), item.key, otherItems);
 
 		// Process errors if we got them
 		if (errors && errors.length > 0) {
@@ -307,7 +308,7 @@ deepAssign(canMap.prototype, {
 		canEach(computes, function (item) {
 			item.compute.bind('change', function () {
 				itemObj.value = self.attr(itemObj.key);
-				self._validateOne(itemObj, processedObj);
+				self._validateOne(itemObj, processedObj, self.attr());
 			});
 		});
 
@@ -324,7 +325,7 @@ proto.__set = function (prop, value, current, success, error) {
 	var mapIniting = this._initValidate;
 
 	if (checkValidate !== false) {
-		validateOpts = resolveComputes({key: prop, value: value}, validateOpts);
+		validateOpts = resolveComputes({key: prop, value: value}, validateOpts, this.attr());
 		// If validate opts are set and not initing, validate properties
 		// If validate opts are set and initing, validate properties only if validateOnInit is true
 		if ((validateOpts && !mapIniting) || (validateOpts && mapIniting && validateOpts.validateOnInit)) {

diff --git a/can-validate/shims/validatejs.shim.js b/can-validate/shims/validatejs.shim.js
@@ -52,7 +52,7 @@ var Shim = Construct.extend({
 	* @return {undefined|array} Returns undefined if no errors, otherwise returns
 	* a list of errors.
 	*/
-	once: function (value, options, name) {
+	once: function (value, options, name, otherItems) {
 		var errors = [];
 		var opts = [];
 		var validationOpts = [];
@@ -61,6 +61,7 @@ var Shim = Construct.extend({
 		if (name) {
 			// Since name exists, use the main validate method but just pass one
 			// property to it. Need to structure the objects it expects first.
+			opts = can.extend({}, otherItems);
 			opts[name] = value;
 			validationOpts[name] = processOptions(options);