colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-11-07 07:33:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/280north/cappuccino

Browse Source
This commit is contained in:
Randall Luecke committed 2010-12-19 15:33:26 -05:00
2 parents 088b6eac35 ea1068c465
commit a1efd1d024
2 files changed
+13 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Foundation/CPValueTransformer.j
+5 -4
View File
@@ -184,7 +184,8 @@ var transformerMap = [CPDictionary dictionary];
@end
CPNegateBooleanTransformerName = @"CPNegateBooleanTransformerName";
CPIsNilTransformerName = @"CPIsNilTransformerName";
CPIsNotNilTransformerName = @"CPIsNotNilTransformerName";
CPUnarchiveFromDataTransformerName = @"CPUnarchiveFromDataTransformerName";
CPNegateBooleanTransformerName = @"CPNegateBoolean";
CPIsNilTransformerName = @"CPIsNil";
CPIsNotNilTransformerName = @"CPIsNotNil";
CPUnarchiveFromDataTransformerName = @"CPUnarchiveFromData";
CPKeyedUnarchiveFromDataTransformerName = @"CPKeyedUnarchiveFromData";
Tools/nib2cib/NSNibConnector.j
+8 -2
View File
@@ -124,8 +124,14 @@ NIB_CONNECTION_EQUIVALENCY_TABLE = {};
aKey;
while (aKey = [keyEnum nextObject])
{
var CPKey = "CP" + aKey.substring(2);
[_options setObject:[nsoptions objectForKey:aKey] forKey:CPKey];
var CPKey = [CPString stringWithFormat:@"CP%@", aKey.substring(2)],
nsvalue = [nsoptions objectForKey:aKey],
nstramsformers = [CPArray arrayWithObjects:@"NSNegateBoolean", @"NSIsNil", @"NSIsNotNil", @"NSUnarchiveFromData", @"NSKeyedUnarchiveFromData"];
if (CPKey == CPValueTransformerNameBindingOption && [nstramsformers containsObject:nsvalue])
nsvalue = [CPString stringWithFormat:@"CP%@", nsvalue.substring(2)];
[_options setObject:nsvalue forKey:CPKey];
}
CPLog.debug(@"Binding Connector: " + [_binding description] + " to: " + _destination + " " + [_keyPath description] + " " + [_options description]);