Merge pull request #1542 from BlairDuncan/controlDidFailToFormatStringFix

controlDidFailToFormatString should send a string not an HTML element
This commit is contained in:
aparajita
2012-05-15 21:39:14 -07:00
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -652,7 +652,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
var acceptInvalidValue = NO;
if ([_delegate respondsToSelector:@selector(control:didFailToFormatString:errorDescription:)])
acceptInvalidValue = [_delegate control:self didFailToFormatString:[self _inputElement] errorDescription:error];
acceptInvalidValue = [_delegate control:self didFailToFormatString:aValue errorDescription:error];
if (acceptInvalidValue === NO)
return NO;
+2 -2
View File
@@ -149,7 +149,7 @@ var randomFromTo = function(from, to)
else
result = nil;
console.log("stringForObjectValue:%s ==> %s", [anObject description], result);
CPLog.info("stringForObjectValue:%s ==> %s", [anObject description], result);
return result;
}
@@ -169,7 +169,7 @@ var randomFromTo = function(from, to)
result = error === nil;
console.log("getObjectValue:forString:%s ==> %s", aString, result);
CPLog.info("getObjectValue:forString:%s ==> %s", aString, result);
return result;
}