colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-12 19:47:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	Foundation/CPKeyValueObserving.j
This commit is contained in:
Francisco Ryan Tolmasky I committed 2009-07-27 12:10:51 -07:00
2 parents 59bec06e6e 0ef4e9bca5
commit e9fee72744
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
Foundation/CPKeyValueObserving.j
+4 -4
View File
@@ -99,7 +99,7 @@ CPKeyValueChangeRemoval = 3;
CPKeyValueChangeReplacement = 4;
var kvoNewAndOld = CPKeyValueObservingOptionNew|CPKeyValueObservingOptionOld,
DependentKeysMap = {},
DependentKeysKey = "$KVODEPENDENT",
KVOProxyKey = "$KVOPROXY";
//rule of thumb: _ methods are called on the real proxy object, others are called on the "fake" proxy object (aka the real object)
@@ -210,12 +210,12 @@ var kvoNewAndOld = CPKeyValueObservingOptionNew|CPKeyValueObservingOptionOld,
if (!affectingKeysCount)
return;
var dependentKeysForClass = DependentKeysMap[[_nativeClass UID]];
var dependentKeysForClass = _nativeClass[DependentKeysKey];
if (!dependentKeysForClass)
{
dependentKeysForClass = {};
DependentKeysMap[[_nativeClass UID]] = dependentKeysForClass;
_nativeClass[DependentKeysKey] = dependentKeysForClass;
}
while (affectingKeysCount--)
@@ -374,7 +374,7 @@ var kvoNewAndOld = CPKeyValueObservingOptionNew|CPKeyValueObservingOptionOld,
[observerInfo.observer observeValueForKeyPath:aKey ofObject:_targetObject change:changes context:observerInfo.context];
}
var dependentKeysMap = DependentKeysMap[[_nativeClass UID]];
var dependentKeysMap = _nativeClass[DependentKeysKey];
if (!dependentKeysMap)
return;