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

Fix subtracting theme states

Browse Source
This commit is contained in:
Saikat Chakrabarti committed 2014-02-20 17:30:28 -08:00
1 parent 5309cc5916
commit bad731c86f
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPTheme.j
+3 -3
View File
@@ -425,17 +425,17 @@ CPThemeState.subtractThemeStates = function(aState1, aState2)
if (aState2 === undefined || aState2 === nil || aState2 === [CPNull null])
return aState1;
var newThemeState = new ThemeState({});
var newStates = {};
for (var stateName in aState1._stateNames)
{
if (!aState1._stateNames.hasOwnProperty(stateName))
continue;
if (!aState2._stateNames[stateName])
newThemeState[stateName] = true;
newStates[stateName] = true;
}
return CPThemeState._cacheThemeState(newThemeState);
return CPThemeState._cacheThemeState(new ThemeState(newStates));
}
CPThemeState._cacheThemeState = function(aState)