Bump XcodeCapp copyright year.

Fixed: missed some version number bumps in the 0.9.9 release.
Fixed: CPNumber intValue did not return an integer.
2026-09-09 12:17:13 +00:00 · 2016-04-01 22:44:23 +01:00 · 2016-04-01 22:25:21 +01:00 · 2016-04-01 22:22:03 +01:00 · 2016-04-01 01:05:40 +02:00 · 2016-03-29 23:32:12 +01:00
86 changed files with 2535 additions and 3217 deletions
@@ -598,7 +598,8 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
    CPBoxBorderTypeKey    = @"CPBoxBorderTypeKey",
    CPBoxTitle            = @"CPBoxTitle",
    CPBoxTitlePosition    = @"CPBoxTitlePosition",
-    CPBoxTitleView        = @"CPBoxTitleView";
+    CPBoxTitleView        = @"CPBoxTitleView",
+    CPBoxContentView      = @"CPBoxContentView";

@implementation CPBox (CPCoding)

@@ -615,7 +616,20 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
        _titlePosition = [aCoder decodeIntForKey:CPBoxTitlePosition];
        _titleView     = [aCoder decodeObjectForKey:CPBoxTitleView] || [CPTextField labelWithTitle:_title];

-        _contentView   = [self subviews][0];
+        if (_boxType != CPBoxSeparator)
+        {
+            // FIXME: we have a problem with CIB decoding here.
+            // We should be able to simply add : _contentView = [self subviews][0]
+            // but first box subview seems to be malformed (badly decoded).
+            // For example, when deployed, this view doesn't have its _trackingAreas array initialized.
+            // As a (temporary) workaround, we encode/decode the _contentView property. We then transfer the subview hierarchy
+            // and replace the first (and only) box subview with this _contentView
+
+            _contentView = [aCoder decodeObjectForKey:CPBoxContentView] || [[CPView alloc] initWithFrame:[self bounds]];
+            var malformedContentView = [self subviews][0];
+            [_contentView setSubviews:[malformedContentView subviews]];
+            [self replaceSubview:malformedContentView with:_contentView];
+        }

        [self setAutoresizesSubviews:YES];
        [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
@@ -635,6 +649,7 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
    [aCoder encodeObject:_title forKey:CPBoxTitle];
    [aCoder encodeInt:_titlePosition forKey:CPBoxTitlePosition];
    [aCoder encodeObject:_titleView forKey:CPBoxTitleView];
+    [aCoder encodeObject:_contentView forKey:CPBoxContentView];
 }

@end
@@ -483,13 +483,12 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
        ];
    }

-    var cookieValue = eval(cookieValue),
-        result = [];
+    var cookieValue = eval(cookieValue);

-    for (var i = 0; i < cookieValue.length; i++)
-        result.push([CPColor colorWithHexString:cookieValue[i]]);
-
-    return result;
+    return [cookieValue arrayByApplyingBlock:function(value)
+    {
+        return [CPColor colorWithHexString:value];
+    }];
 }

 - (CPArray)saveColorList
@@ -1142,11 +1142,9 @@ var CPComboBoxTextSubview = @"text",
    // Directly nuke _items, [_items removeAll] will trigger an extra call to setContent
    _items = [];

-    var values = [];
-
-    [anArray enumerateObjectsUsingBlock:function(object)
+    var values = [anArray arrayByApplyingBlock:function(object)
    {
-        values.push([object description]);
+        return [object description];
    }];

    [self addItemsWithObjectValues:values];
@@ -70,11 +70,12 @@ CPGradientDrawsAfterEndingLocation      = kCGGradientDrawsAfterEndLocation;
 {
    if (self = [super init])
    {
-        var cgColors = [],
-            count = [someColors count],
-            colorSpace = [aColorSpace CGColorSpace] || CGColorSpaceCreateDeviceRGB;
-        for (var i = 0; i < count; i++)
-            cgColors.push(CGColorCreate(colorSpace, [someColors[i] components]));
+        var colorSpace = [aColorSpace CGColorSpace] || CGColorSpaceCreateDeviceRGB,
+            cgColors = [someColors arrayByApplyingBlock:function(color)
+            {
+                return CGColorCreate(colorSpace, [color components])
+            }];
+
        _gradient = CGGradientCreateWithColors(colorSpace, cgColors, someLocations);
    }

@@ -43,10 +43,10 @@ function CPDrawTiledRects(
    if (sides.length != grays.length)
        [CPException raise:CPInvalidArgumentException reason:@"sides (length: " + sides.length + ") and grays (length: " + grays.length + ") must have the same length."];

-    var colors = [];
-
-    for (var i = 0; i < grays.length; ++i)
-        colors.push([CPColor colorWithCalibratedWhite:grays[i] alpha:1.0]);
+    var colors = [grays arrayByApplyingBlock:function(gray)
+    {
+        return [CPColor colorWithCalibratedWhite:gray alpha:1.0];
+    }];

    return CPDrawColorTiledRects(boundsRect, clipRect, sides, colors);
 }
@@ -27,6 +27,9 @@
@import "CPController.j"
@import "CPKeyValueBinding.j"

+@class _CPManagedProxy
+@class CPPredicate;
+
 /*!
    @class

@@ -47,6 +50,9 @@

    BOOL            _isEditable;
    BOOL            _automaticallyPreparesContent;
+    BOOL            _usesLazyFetching @accessors(getter=usesLazyFetching, setter=setUsesLazyFetching:);
+    BOOL            _isUsingManagedProxy;
+    _CPManagedProxy _managedProxy;

    CPCountedSet    _observedKeys;
 }
@@ -179,6 +185,46 @@
    return _automaticallyPreparesContent;
 }

+/*!
+    Sets the entity name the controller handles.
+
+    @param CPString newEntityName - The new entity name.
+*/
+- (void)setEntityName:(CPString)newEntityName
+{
+    [_managedProxy setEntityName:newEntityName];
+}
+
+/*!
+    Returns the entity name.
+
+    @return CPString - The name of the entity.
+*/
+- (CPString)entityName
+{
+    return [_managedProxy entityName];
+}
+
+/*!
+    Sets the predicate used to fetch content.
+
+    @param CPPredicate newPredicate - The fetch predicate.
+*/
+- (void)setFetchPredicate:(CPPredicate)newPredicate
+{
+    [_managedProxy setFetchPredicate:newPredicate];
+}
+
+/*!
+    Returns the fetch predicate.
+
+    @return CPPredicate - The predicate used to fetch content.
+*/
+- (CPPredicate)fetchPredicate
+{
+    return [_managedProxy fetchPredicate];
+}
+
 /*!
    Overridden by a subclass that require control over the creation of new objects.
 */
@@ -189,6 +235,7 @@

 /*!
    Sets the object class when creating new objects.
+
    @param Class - the class of new objects that will be created.
 */
 - (void)setObjectClass:(Class)aClass
@@ -363,7 +410,10 @@
 var CPObjectControllerContentKey                        = @"CPObjectControllerContentKey",
    CPObjectControllerObjectClassNameKey                = @"CPObjectControllerObjectClassNameKey",
    CPObjectControllerIsEditableKey                     = @"CPObjectControllerIsEditableKey",
-    CPObjectControllerAutomaticallyPreparesContentKey   = @"CPObjectControllerAutomaticallyPreparesContentKey";
+    CPObjectControllerAutomaticallyPreparesContentKey   = @"CPObjectControllerAutomaticallyPreparesContentKey",
+    CPObjectControllerUsesLazyFetchingKey               = @"CPObjectControllerUsesLazyFetchingKey",
+    CPObjectControllerIsUsingManagedProxyKey            = @"CPObjectControllerIsUsingManagedProxyKey",
+    CPObjectControllerManagedProxyKey                   = @"CPObjectControllerManagedProxyKey";

@implementation CPObjectController (CPCoding)

@@ -374,12 +424,18 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
    if (self)
    {
        var objectClassName = [aCoder decodeObjectForKey:CPObjectControllerObjectClassNameKey],
-            objectClass = CPClassFromString(objectClassName);
+            objectClass = CPClassFromString(objectClassName),
+            content = [aCoder decodeObjectForKey:CPObjectControllerContentKey];

        [self setObjectClass:objectClass || [CPMutableDictionary class]];
        [self setEditable:[aCoder decodeBoolForKey:CPObjectControllerIsEditableKey]];
        [self setAutomaticallyPreparesContent:[aCoder decodeBoolForKey:CPObjectControllerAutomaticallyPreparesContentKey]];
-        [self setContent:[aCoder decodeObjectForKey:CPObjectControllerContentKey]];
+        [self setUsesLazyFetching:[aCoder decodeBoolForKey:CPObjectControllerUsesLazyFetchingKey]];
+        _isUsingManagedProxy = [aCoder decodeBoolForKey:CPObjectControllerIsUsingManagedProxyKey];
+        _managedProxy = [aCoder decodeObjectForKey:CPObjectControllerManagedProxyKey];
+
+        if (content != nil)
+            [self setContent:content];

        _observedKeys = [[CPCountedSet alloc] init];
    }
@@ -398,6 +454,11 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo

    [aCoder encodeBool:[self isEditable] forKey:CPObjectControllerIsEditableKey];
    [aCoder encodeBool:[self automaticallyPreparesContent] forKey:CPObjectControllerAutomaticallyPreparesContentKey];
+    [aCoder encodeBool:[self usesLazyFetching] forKey:CPObjectControllerUsesLazyFetchingKey];
+    [aCoder encodeBool:_isUsingManagedProxy forKey:CPObjectControllerIsUsingManagedProxyKey];
+
+    if (_managedProxy)
+        [aCoder encodeObject:_managedProxy forKey:CPObjectControllerManagedProxyKey];
 }

 - (void)awakeFromCib
@@ -825,3 +886,38 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 }

@end
+
+
+@implementation _CPManagedProxy : CPObject
+{
+    CPString    _entityName @accessors(getter=entityName, setter=setEntityName:);
+    CPPredicate _fetchPredicate @accessors(getter=fetchPredicate, setter=setFetchPredicate:);
+}
+
+@end
+
+var CPManagedProxyEntityNameKey                         = @"CPManagedProxyEntityNameKey",
+    CPManagedProxyFetchPredicateKey                     = @"CPManagedProxyFetchPredicateKey";
+
+@implementation _CPManagedProxy (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+
+    if (self)
+    {
+        [self setEntityName:[aCoder decodeObjectForKey:CPManagedProxyEntityNameKey]];
+        [self setFetchPredicate:[aCoder decodeObjectForKey:CPManagedProxyFetchPredicateKey]];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:[self entityName] forKey:CPManagedProxyEntityNameKey];
+    [aCoder encodeObject:[self fetchPredicate] forKey:CPManagedProxyFetchPredicateKey];
+}
+
+@end
@@ -361,15 +361,10 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (CPArray)itemTitles
 {
-    var titles = [],
-        items = [self itemArray],
-        index = 0,
-        count = [items count];
-
-    for (; index < count; ++index)
-        titles.push([items[index] title]);
-
-    return titles;
+    return [[self itemArray] arrayByApplyingBlock:function(item)
+    {
+        return [item title];
+    }];
 }

 /*!
@@ -34,8 +34,7 @@ CPSearchFieldRecentsMenuItemTag         = 1001;
 CPSearchFieldClearRecentsMenuItemTag    = 1002;
 CPSearchFieldNoRecentsMenuItemTag       = 1003;

-var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotification",
-    RECENT_SEARCH_PREFIX = @"   ";
+var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotification";

 /*!
    @ingroup appkit
@@ -629,10 +628,10 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat

                for (var recentIndex = 0; recentIndex < countOfRecents; ++recentIndex)
                {
-                    // RECENT_SEARCH_PREFIX is a hack until CPMenuItem -setIndentationLevel works
-                    var recentItem = [[CPMenuItem alloc] initWithTitle:RECENT_SEARCH_PREFIX + [_recentSearches objectAtIndex:recentIndex]
+                    var recentItem = [[CPMenuItem alloc] initWithTitle:[_recentSearches objectAtIndex:recentIndex]
                                                                 action:itemAction
                                                          keyEquivalent:[item keyEquivalent]];
+                    [recentItem setIndentationLevel:1];
                    [item setTarget:self];
                    [menu addItem:recentItem];
                }
@@ -718,7 +717,7 @@ var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotificat

 - (void)_searchFieldSearch:(id)sender
 {
-    var searchString = [[sender title] substringFromIndex:[RECENT_SEARCH_PREFIX length]];
+    var searchString = [sender title];

    if ([sender tag] != CPSearchFieldRecentsMenuItemTag)
        [self _addStringToRecentSearches:searchString];
@@ -64,12 +64,10 @@
 */
 - (CPArray)themeNames
 {
-    var names = [];
-
-    for (var i = 0; i < _themes.length; ++i)
-        names.push(_themes[i].substring(0, _themes[i].indexOf(".keyedtheme")));
-
-    return names;
+    return [_themes arrayByApplyingBlock:function(theme)
+    {
+        return theme.substring(0, theme.indexOf(".keyedtheme"));
+    }];
 }

 - (void)loadWithDelegate:(id)aDelegate
@@ -459,11 +459,10 @@ var CPToolbarsByIdentifier              = nil,
 /* @ignore */
 - (id)_itemsWithIdentifiers:(CPArray)identifiers
 {
-    var items = [];
-    for (var i = 0; i < identifiers.length; i++)
-        [items addObject:[self _itemForItemIdentifier:identifiers[i] willBeInsertedIntoToolbar:NO]];
-
-    return items;
+    return [identifiers arrayByApplyingBlock:function(identifier)
+    {
+        return [self _itemForItemIdentifier:identifier willBeInsertedIntoToolbar:NO];
+    }];
 }

 /* @ignore */
@@ -805,13 +805,13 @@ var CPViewHighDPIDrawingEnabled = YES;
        [_window _noteUnregisteredDraggedTypes:_registeredDraggedTypes];
        [aWindow _noteRegisteredDraggedTypes:_registeredDraggedTypes];
    }
-    
+
    // View must be removed from the current window viewsWithTrackingAreas
    if (_window && (_trackingAreas.length > 0))
        [_window _removeTrackingAreaView:self];

    _window = aWindow;
-    
+
    if (_window)
    {
        var owners;
@@ -3459,16 +3459,16 @@ setBoundsOrigin:
    // Consistency check
    if (!trackingArea || [_trackingAreas containsObjectIdenticalTo:trackingArea])
        return;
-    
+
    if ([trackingArea view])
        [CPException raise:CPInternalInconsistencyException reason:"Tracking area has already been added to another view."];

    [_trackingAreas addObject:trackingArea];
    [trackingArea setView:self];
-    
+
    if (_window)
        [_window _addTrackingArea:trackingArea];
-  
+
    [trackingArea _updateWindowRect];
 }

@@ -3477,14 +3477,14 @@ setBoundsOrigin:
    // Consistency check
    if (!trackingArea)
        return;
-    
+
    if (![_trackingAreas containsObjectIdenticalTo:trackingArea])
        [CPException raise:CPInternalInconsistencyException reason:"Trying to remove unreferenced trackingArea"];

    [self _removeTrackingArea:trackingArea];
 }

-/*! 
+/*!
 Invoked automatically when the view’s geometry changes such that its tracking areas need to be recalculated.

 You should override this method to remove out of date tracking areas and add recomputed tracking areas;
@@ -3530,7 +3530,7 @@ setBoundsOrigin:
 {
    if (_window)
        [_window _removeTrackingArea:trackingArea];
-    
+
    [trackingArea setView:nil];
    [_trackingAreas removeObjectIdenticalTo:trackingArea];
 }
@@ -3538,16 +3538,16 @@ setBoundsOrigin:
 - (void)_updateTrackingAreas
 {
    _inhibitUpdateTrackingAreas = YES;
-    
+
    [self _recursivelyUpdateTrackingAreas];
-    
+
    _inhibitUpdateTrackingAreas = NO;
 }

 - (void)_recursivelyUpdateTrackingAreas
 {
    [self _updateTrackingAreasForOwners:[self _calcTrackingAreaOwners]];
-    
+
    for (var i = 0; i < _subviews.length; i++)
        [_subviews[i] _recursivelyUpdateTrackingAreas];
 }
@@ -3557,25 +3557,25 @@ setBoundsOrigin:
    // First search all owners that must be notified
    // Remark: 99.99% of time, the only owner will be the view itself
    // In the same time, update the rects of InVisibleRect tracking areas
-    
+
    var owners = [];
-    
+
    for (var i = 0; i < _trackingAreas.length; i++)
    {
        var trackingArea = _trackingAreas[i];
-        
+
        if ([trackingArea options] & CPTrackingInVisibleRect)
            [trackingArea _updateWindowRect];
-        
+
        else
        {
            var owner = [trackingArea owner];
-            
+
            if (![owners containsObjectIdenticalTo:owner])
                [owners addObject:owner];
        }
    }
-    
+
    return owners;
 }

@@ -3606,7 +3606,7 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
    CPViewScaleKey                  = @"CPViewScaleKey",
    CPViewSizeScaleKey              = @"CPViewSizeScaleKey",
    CPViewIsScaledKey               = @"CPViewIsScaledKey",
-    CPViewAppearanceKey             = @"CPViewAppearanceKey";
+    CPViewAppearanceKey             = @"CPViewAppearanceKey",
    CPViewTrackingAreasKey          = @"CPViewTrackingAreasKey";

@implementation CPView (CPCoding)
@@ -3636,10 +3636,10 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
    if (self)
    {
        _trackingAreas = [aCoder decodeObjectForKey:CPViewTrackingAreasKey];
-        
+
        if (!_trackingAreas)
            _trackingAreas = [];
-        
+
        // We have to manually check because it may be 0, so we can't use ||
        _tag = [aCoder containsValueForKey:CPViewTagKey] ? [aCoder decodeIntForKey:CPViewTagKey] : -1;
        _identifier = [aCoder decodeObjectForKey:CPReuseIdentifierKey];
@@ -149,9 +149,10 @@ var CPViewControllerCachedCibs;

    If you use Interface Builder to create your views, and you initialize the
    controller using the initWithCibName:bundle: methods, then you MUST NOT override
-    this method. The consequences risk shattering the space-time continuum.
-
-    Note: The cib loading system is currently synchronous.
+    this method.
+    
+    @note When using this method, the cib loading system is synchronous.
+    See the loadViewWithCompletionHandler: method for an asynchronous loading.
 */
 - (void)loadView
 {
@@ -176,6 +177,67 @@ var CPViewControllerCachedCibs;
        _view = [CPView new];
 }

+/*!
+    Loads asynchronously the cib and creates the view that the controller manages.
+    
+    @param aHandler A function passing the loaded view as the first argument
+    and a network error or nil as the second argument: function(view, error).
+    
+    @note If the view has already been loaded, the completion handler is run immediatly 
+    and the process is synchronous.
+*/
+- (void)loadViewWithCompletionHandler:(Function/*(view, error)*/)aHandler
+{
+    if (_view)
+        return;
+
+    if (_cibName)
+    {
+        // check if a cib is already cached for the current _cibName
+        var cib = [CPViewControllerCachedCibs objectForKey:_cibName];
+
+        if (!cib)
+        {
+            var cibName = _cibName;
+
+            if (![cibName hasSuffix:@".cib"])
+                cibName = [cibName stringByAppendingString:@".cib"];
+
+            // If aBundle is nil, use mainBundle, but ONLY for searching for the nib, not for resources later.
+            var bundle = _cibBundle || [CPBundle mainBundle],
+                url = [bundle _cibPathForResource:cibName];
+
+            // if the cib isn't cached yet : fetch it and cache it
+            [CPURLConnection sendAsynchronousRequest:[CPURLRequest requestWithURL:url] queue:[CPOperationQueue mainQueue] completionHandler:function(aResponse, aData, anError)
+            {
+                if (anError == nil)
+                {
+                    var data = [CPData dataWithRawString:aData],
+                        aCib = [[CPCib alloc] _initWithData:data bundle:_cibBundle cibName:_cibName];
+
+                    [CPViewControllerCachedCibs setObject:aCib forKey:_cibName];
+                    [aCib instantiateCibWithExternalNameTable:_cibExternalNameTable];
+                    aHandler(_view, nil);
+                }
+                else
+                {
+                    aHandler(nil, anError);
+                }
+            }];
+        }
+        else
+        {
+            [cib instantiateCibWithExternalNameTable:_cibExternalNameTable];
+            aHandler(_view, nil);
+        }
+    }
+    else
+    {
+        _view = [CPView new];
+        aHandler(_view, nil);
+    }
+}
+
 /*!
    Returns the view that the controller manages.

@@ -198,8 +198,13 @@ var CPWindowActionMessageKeys = [
    CPView                              _contentView;
    CPView                              _toolbarView;

+    BOOL                                _handlingTrackingAreaEvent;
+    BOOL                                _restartHandlingTrackingAreaEvent;
+    CPArray                             _previousMouseEnteredStack;
+    CPArray                             _previousCursorUpdateStack;
    CPArray                             _mouseEnteredStack;
    CPArray                             _cursorUpdateStack;
+    CPArray                             _queuedEvents;
    CPArray                             _trackingAreaViews;
    id                                  _activeCursorTrackingArea;
    CPArray                             _queuedTrackingEvents;
@@ -340,9 +345,14 @@ CPTexturedBackgroundWindowMask

        [self setLevel:CPNormalWindowLevel];

+        _handlingTrackingAreaEvent = NO;
+        _restartHandlingTrackingAreaEvent = NO;
        _trackingAreaViews = [];
+        _previousMouseEnteredStack = [];
+        _previousCursorUpdateStack = [];
        _mouseEnteredStack = [];
        _cursorUpdateStack = [];
+        _queuedEvents = [];
        _queuedTrackingEvents = [];
        _activeCursorTrackingArea = nil;

@@ -1980,7 +1990,7 @@ CPTexturedBackgroundWindowMask
            // First, we search for any tracking area requesting CPTrackingEnabledDuringMouseDrag.
            // At the same time, we update the entered stack.
            [self _handleTrackingAreaEvent:anEvent];
-            
+
            // Normal mouseDragged workflow
            if (!_leftMouseDownView)
                return [[_windowView hitTest:point] mouseDragged:anEvent];
@@ -2004,7 +2014,7 @@ CPTexturedBackgroundWindowMask
            // Ignore mouse moves for parents of sheets
            if (!_acceptsMouseMovedEvents || sheet)
                return;
-            
+
            [self _handleTrackingAreaEvent:anEvent];
    }
 }
@@ -3824,7 +3834,7 @@ var interpolate = function(fromValue, toValue, progress)
 - (void)_addTrackingAreaView:(CPView)aView
 {
    var trackingAreas = [aView trackingAreas];
-    
+
    for (var i = 0; i < trackingAreas.length; i++)
        [self _addTrackingArea:trackingAreas[i]];
 }
@@ -3832,7 +3842,7 @@ var interpolate = function(fromValue, toValue, progress)
 - (void)_removeTrackingAreaView:(CPView)aView
 {
    var trackingAreas = [aView trackingAreas];
-    
+
    for (var i = 0; i < trackingAreas.length; i++)
        [self _removeTrackingArea:trackingAreas[i]];
 }
@@ -3840,63 +3850,143 @@ var interpolate = function(fromValue, toValue, progress)
 - (void)_addTrackingArea:(CPTrackingArea)trackingArea
 {
    var trackingAreaView = [trackingArea view];
-    
+
    if (![_trackingAreaViews containsObjectIdenticalTo:trackingAreaView])
        [_trackingAreaViews addObject:trackingAreaView];
-    
-    // If CPTrackingAssumeInside option is set, put the tracking area in the _mouseEnteredStack
-    
-    if ([trackingArea options] & CPTrackingAssumeInside)
-        [_mouseEnteredStack addObject:trackingArea];
+
+    // If CPTrackingAssumeInside option is set, insert the tracking area in the events management system
+    // in order to have the first event sent only when mouse leaves the tracking area
+
+    [self _insertTrackingArea:trackingArea assumeInside:([trackingArea options] & CPTrackingAssumeInside)];
 }

 - (void)_removeTrackingArea:(CPTrackingArea)trackingArea
 {
    // If mouse is in the tracking area, we remove it from the stack to avoid to fire a future mouseExited event
-    
-    [_mouseEnteredStack removeObjectIdenticalTo:trackingArea];
-    
+
+    [self _purgeTrackingArea:trackingArea];
+
    var trackingAreaView = [trackingArea view];
-    
+
    [_trackingAreaViews removeObjectIdenticalTo:trackingAreaView];
 }

+- (void)_insertTrackingArea:(CPTrackingArea)trackingArea assumeInside:(BOOL)assumeInside
+{
+    if (_handlingTrackingAreaEvent)
+        _restartHandlingTrackingAreaEvent = YES;
+
+    if (assumeInside)
+    {
+        if (_handlingTrackingAreaEvent)
+            [_mouseEnteredStack addObject:trackingArea];
+        else
+            [_previousMouseEnteredStack addObject:trackingArea];
+    }
+}
+
+- (void)_purgeTrackingArea:(CPTrackingArea)trackingArea
+{
+    if (_handlingTrackingAreaEvent)
+    {
+        [_mouseEnteredStack removeObjectIdenticalTo:trackingArea];
+
+        var i = _queuedEvents.length;
+
+        while (i--)
+            if ([_queuedEvents[i] trackingArea] === trackingArea)
+                [_queuedEvents removeObjectAtIndex:i];
+
+        _cursorUpdateStack = [];
+        _activeCursorTrackingArea = nil;
+    }
+    else
+    {
+        [_previousMouseEnteredStack removeObjectIdenticalTo:trackingArea];
+        [_previousCursorUpdateStack removeObjectIdenticalTo:trackingArea];
+    }
+}
+
 - (void)_handleTrackingAreaEvent:(CPEvent)anEvent
 {
-    var mouseEnteredStack = [],
-        cursorUpdateStack = [],
-        point             = [anEvent locationInWindow],
-        dragging          = ([anEvent type] !== CPMouseMoved);
+    _handlingTrackingAreaEvent = YES;

-    // Handle mouse entering tracking areas (and calc mouseEnteredStack and cursorUpdateStack)
-    
-    [self _handleMouseMovedAndEnteredEventsForEvent:anEvent atPoint:point dragging:dragging mouseEnteredStack:mouseEnteredStack cursorUpdateStack:cursorUpdateStack];
+    var point    = [anEvent locationInWindow],
+        dragging = ([anEvent type] !== CPMouseMoved);

-    // Handle mouse exiting tracking areas
-
-    [self _handleMouseExitedEventsForEvent:anEvent atPoint:point dragging:dragging mouseEnteredStack:mouseEnteredStack];
-
-    // Cursor update
-
-    if (cursorUpdateStack.length > 0)
+    do
    {
-        [self _handleCursorUpdateEventsForEvent:anEvent atPoint:point dragging:dragging cursorUpdateStack:cursorUpdateStack];
-    }
-    else if (!dragging)
-    {
-        // Here, we are outsite the window content view tracking area, so let _windowView set the cursor (resize cursor, ...)
+        // Initialize this run
+        _restartHandlingTrackingAreaEvent = NO;

-        [_windowView setCursorForLocation:point resizing:NO];
-        _activeCursorTrackingArea = nil;
-    }
+        _mouseEnteredStack = [];
+        _cursorUpdateStack = [];

-    // Prepare for next call
-    
-    _mouseEnteredStack = mouseEnteredStack;
-    _cursorUpdateStack = cursorUpdateStack;
+        // Important remark: we must queue events to avoid running conditions when a view uses a mouse event to modify view hierarchy
+
+        _queuedEvents = [];
+
+        // Handle mouse entering tracking areas (and calc _mouseEnteredStack and _cursorUpdateStack)
+
+        [self _handleMouseMovedAndEnteredEventsForEvent:anEvent atPoint:point dragging:dragging];
+
+        // Handle mouse exiting tracking areas
+
+        [self _handleMouseExitedEventsForEvent:anEvent atPoint:point dragging:dragging];
+
+        // Cursor update
+
+        if (_cursorUpdateStack.length > 0)
+        {
+            [self _handleCursorUpdateEventsForEvent:anEvent atPoint:point dragging:dragging];
+        }
+        else if (!dragging)
+        {
+            // Here, we are outside the window content view tracking area, so let _windowView set the cursor (resize cursor, ...)
+
+            [_windowView setCursorForLocation:point resizing:NO];
+            _activeCursorTrackingArea = nil;
+        }
+
+        // Send all queued events
+        // Important remark : as an event can modify the view hierarchy, the events queue could be modified while processing it
+
+        while (_queuedEvents.length > 0)
+        {
+            var queuedEvent   = _queuedEvents[0],
+                trackingArea  = [queuedEvent trackingArea],
+                trackingOwner = [trackingArea owner];
+
+            switch ([queuedEvent type])
+            {
+                case CPMouseEntered:
+                    [trackingOwner mouseEntered:queuedEvent];
+                    break;
+
+                case CPMouseExited:
+                    [trackingOwner mouseExited:queuedEvent];
+                    break;
+
+                case CPCursorUpdate:
+                    [trackingOwner cursorUpdate:queuedEvent];
+                    break;
+            }
+
+            if (queuedEvent === _queuedEvents[0])
+                [_queuedEvents removeObjectAtIndex:0];
+        }
+
+        // Prepare for next call
+
+        _previousMouseEnteredStack = _mouseEnteredStack;
+        _previousCursorUpdateStack = _cursorUpdateStack;
+    }
+    while (_restartHandlingTrackingAreaEvent)
+
+    _handlingTrackingAreaEvent = NO;
 }

- (void)_handleMouseMovedAndEnteredEventsForEvent:(CPEvent)anEvent atPoint:(CGPoint)point dragging:(BOOL)dragging mouseEnteredStack:(CPArray)mouseEnteredStack cursorUpdateStack:(CPArray)cursorUpdateStack
+- (void)_handleMouseMovedAndEnteredEventsForEvent:(CPEvent)anEvent atPoint:(CGPoint)point dragging:(BOOL)dragging
 {
    var isKeyWindow = [self isKeyWindow];

@@ -3923,9 +4013,9 @@ var interpolate = function(fromValue, toValue, progress)
                continue;
            }

-            [mouseEnteredStack addObject:aTrackingArea];
+            [_mouseEnteredStack addObject:aTrackingArea];

-            if ([_mouseEnteredStack containsObjectIdenticalTo:aTrackingArea])
+            if ([_previousMouseEnteredStack containsObjectIdenticalTo:aTrackingArea])
            {
                // Mouse was already in this rect so it's a mouseMoved

@@ -3946,32 +4036,33 @@ var interpolate = function(fromValue, toValue, progress)
                if (dragging && !(trackingOptions & CPTrackingEnabledDuringMouseDrag))
                    [self _queueTrackingEvent:mouseEnteredEvent];
                else
-                    [[aTrackingArea owner] mouseEntered:mouseEnteredEvent];
+                    [_queuedEvents addObject:mouseEnteredEvent];
            }

            if ((trackingOptions & CPTrackingCursorUpdate) && (trackingImplementedMethods & CPTrackingOwnerImplementsCursorUpdate))
-                [cursorUpdateStack addObject:aTrackingArea];
+                [_cursorUpdateStack addObject:aTrackingArea];
        }
    }
 }

- (void)_handleMouseExitedEventsForEvent:(CPEvent)anEvent atPoint:(CGPoint)point dragging:(BOOL)dragging mouseEnteredStack:(CPArray)mouseEnteredStack
+- (void)_handleMouseExitedEventsForEvent:(CPEvent)anEvent atPoint:(CGPoint)point dragging:(BOOL)dragging
 {
-    // Search for exited views (were in _mouseEnteredStack but no more in mouseEnteredStack)
+    // Search for exited views (were in _previousMouseEnteredStack but no more in _mouseEnteredStack)

-    for (var i = 0; i < _mouseEnteredStack.length; i++)
+    for (var i = 0; i < _previousMouseEnteredStack.length; i++)
    {
-        var aTrackingArea   = _mouseEnteredStack[i],
+        var aTrackingArea   = _previousMouseEnteredStack[i],
            trackingOptions = [aTrackingArea options];

-        if ([mouseEnteredStack containsObjectIdenticalTo:aTrackingArea])
+        if ([_mouseEnteredStack containsObjectIdenticalTo:aTrackingArea])
            continue;

        // Mouse is no more in this area so it's a mouseExited

        if ((trackingOptions & CPTrackingMouseEnteredAndExited) && ([aTrackingArea implementedOwnerMethods] & CPTrackingOwnerImplementsMouseExited))
        {
-            var mouseExitedEvent = [CPEvent enterExitEventWithType:CPMouseExited
+            var theView = [aTrackingArea owner],
+                mouseExitedEvent = [CPEvent enterExitEventWithType:CPMouseExited
                                                          location:point
                                                     modifierFlags:[anEvent modifierFlags]
                                                         timestamp:[anEvent timestamp]
@@ -3983,132 +4074,127 @@ var interpolate = function(fromValue, toValue, progress)
            if (dragging && !(trackingOptions & CPTrackingEnabledDuringMouseDrag))
                [self _queueTrackingEvent:mouseExitedEvent];
            else
-                [[aTrackingArea owner] mouseExited:mouseExitedEvent];
+                [_queuedEvents addObject:mouseExitedEvent];
        }

-        // If this is the active cursor area, we reset _cursorUpdateStack so a new active area will be computed
+        // If this is the active cursor area, we reset _previousCursorUpdateStack so a new active area will be computed

        if (aTrackingArea === _activeCursorTrackingArea)
        {
-            _cursorUpdateStack = [];
+            _previousCursorUpdateStack = [];
            _activeCursorTrackingArea = nil;
        }
    }
 }

- (void)_handleCursorUpdateEventsForEvent:(CPEvent)anEvent atPoint:(CGPoint)point dragging:(BOOL)dragging cursorUpdateStack:(CPArray)cursorUpdateStack
+- (void)_handleCursorUpdateEventsForEvent:(CPEvent)anEvent atPoint:(CGPoint)point dragging:(BOOL)dragging
 {
    var overlappingTrackingAreas = [];

-    for (var i = 0; i < cursorUpdateStack.length; i++)
+    for (var i = 0; i < _cursorUpdateStack.length; i++)
    {
-        var aTrackingArea = cursorUpdateStack[i];
+        var aTrackingArea = _cursorUpdateStack[i];

-        if ((![_cursorUpdateStack containsObjectIdenticalTo:aTrackingArea]) || (aTrackingArea === _activeCursorTrackingArea))
+        if ((![_previousCursorUpdateStack containsObjectIdenticalTo:aTrackingArea]) || (aTrackingArea === _activeCursorTrackingArea))
            [overlappingTrackingAreas addObject:aTrackingArea];
    }

-    var nbOverlappingTrackingAreas = overlappingTrackingAreas.length;
+    var frontmostTrackingArea = overlappingTrackingAreas[0],
+        frontmostView         = [frontmostTrackingArea view];

-    if (nbOverlappingTrackingAreas > 0)
+    for (var i = 1; i < overlappingTrackingAreas.length; i++)
    {
-        var frontmostTrackingArea = overlappingTrackingAreas[0],
-            frontmostView         = [frontmostTrackingArea view];
+        var aTrackingArea = overlappingTrackingAreas[i],
+            aView         = [aTrackingArea view];

-        for (var i = 1; i < nbOverlappingTrackingAreas; i++)
+        // First, if aView is _windowView, skip to next overlapping tracking area
+        // as _windowView can't be the frontmost view if there's multiple overlapping tracking areas.
+
+        if (aView === _windowView)
+            continue;
+
+        // Then, if frontmostView is _windowView, aView must become frontmostView
+
+        if (frontmostView === _windowView)
        {
-            var aTrackingArea = overlappingTrackingAreas[i],
-                aView         = [aTrackingArea view];
+            frontmostTrackingArea = aTrackingArea;
+            frontmostView         = aView;

-            // First, if aView is _windowView, skip to next overlapping tracking area
-            // as _windowView can't be the frontmost view if there's multiple overlapping tracking areas.
-
-            if (aView === _windowView)
-                continue;
-
-            // Then, if frontmostView is _windowView, aView must become frontmostView
-
-            if (frontmostView === _windowView)
-            {
-                frontmostTrackingArea = aTrackingArea;
-                frontmostView         = aView;
-
-                continue;
-            }
-
-            // Next verify if aView is a subview of frontmostView
-            // If so, it's our new frontmost view
-
-            var searchingView = aView;
-
-            while ((searchingView !== _contentView) && ([searchingView superview] !== frontmostView))
-                searchingView = [searchingView superview];
-
-            if (searchingView !== _contentView)
-            {
-                frontmostTrackingArea = aTrackingArea;
-                frontmostView         = aView;
-
-                continue;
-            }
-
-            // aView is not a subview of frontmostView
-            // Search in view hierarchy which one will be over the other
-            // (this is done by comparing their draw order)
-
-            var firstView      = frontmostView,
-                firstSuperview = [firstView superview];
-
-            while (firstView !== _contentView)
-            {
-                var secondView      = aView,
-                    secondSuperview = [secondView superview];
-
-                while ((secondSuperview !== _contentView) && (firstSuperview !== secondSuperview))
-                {
-                    secondView      = secondSuperview;
-                    secondSuperview = [secondView superview];
-                }
-
-                if (firstSuperview === secondSuperview)
-                    break;
-
-                firstView      = firstSuperview;
-                firstSuperview = [firstView superview];
-            }
-
-            if (firstSuperview !== secondSuperview)
-                [CPException raise:CPInternalInconsistencyException reason:"Problem with view hierarchy"];
-
-            var firstSuperviewSubviews = [firstSuperview subviews],
-                firstViewIndex         = [firstSuperviewSubviews indexOfObject:firstView],
-                secondViewIndex        = [firstSuperviewSubviews indexOfObject:secondView];
-
-            if (secondViewIndex > firstViewIndex)
-            {
-                frontmostTrackingArea = aTrackingArea;
-                frontmostView         = aView;
-            }
+            continue;
        }

-        if (frontmostTrackingArea !== _activeCursorTrackingArea)
+        // Next verify if aView is a subview of frontmostView
+        // If so, it's our new frontmost view
+
+        var searchingView = aView;
+
+        while ((searchingView !== _contentView) && ([searchingView superview] !== frontmostView))
+            searchingView = [searchingView superview];
+
+        if (searchingView !== _contentView)
        {
-            var cursorUpdateEvent = [CPEvent enterExitEventWithType:CPCursorUpdate
-                                                           location:point
-                                                      modifierFlags:[anEvent modifierFlags]
-                                                          timestamp:[anEvent timestamp]
-                                                       windowNumber:_windowNumber
-                                                            context:nil
-                                                        eventNumber:-1
-                                                       trackingArea:frontmostTrackingArea];
+            frontmostTrackingArea = aTrackingArea;
+            frontmostView         = aView;

-            if (dragging)
-                [self _queueTrackingEvent:cursorUpdateEvent];
-            else
-                [[frontmostTrackingArea owner] cursorUpdate:cursorUpdateEvent];
-
-            _activeCursorTrackingArea = frontmostTrackingArea;
+            continue;
        }
+
+        // aView is not a subview of frontmostView
+        // Search in view hierarchy which one will be over the other
+        // (this is done by comparing their draw order)
+
+        var firstView      = frontmostView,
+            firstSuperview = [firstView superview];
+
+        while (firstView !== _contentView)
+        {
+            var secondView      = aView,
+                secondSuperview = [secondView superview];
+
+            while ((secondSuperview !== _contentView) && (firstSuperview !== secondSuperview))
+            {
+                secondView      = secondSuperview;
+                secondSuperview = [secondView superview];
+            }
+
+            if (firstSuperview === secondSuperview)
+                break;
+
+            firstView      = firstSuperview;
+            firstSuperview = [firstView superview];
+        }
+
+        if (firstSuperview !== secondSuperview)
+            [CPException raise:CPInternalInconsistencyException reason:"Problem with view hierarchy"];
+
+        var firstSuperviewSubviews = [firstSuperview subviews],
+            firstViewIndex         = [firstSuperviewSubviews indexOfObject:firstView],
+            secondViewIndex        = [firstSuperviewSubviews indexOfObject:secondView];
+
+        if (secondViewIndex > firstViewIndex)
+        {
+            frontmostTrackingArea = aTrackingArea;
+            frontmostView         = aView;
+        }
+    }
+
+    if (frontmostTrackingArea !== _activeCursorTrackingArea)
+    {
+        var cursorUpdateEvent = [CPEvent enterExitEventWithType:CPCursorUpdate
+                                                       location:point
+                                                  modifierFlags:[anEvent modifierFlags]
+                                                      timestamp:[anEvent timestamp]
+                                                   windowNumber:_windowNumber
+                                                        context:nil
+                                                    eventNumber:-1
+                                                   trackingArea:frontmostTrackingArea];
+
+        if (dragging)
+            [self _queueTrackingEvent:cursorUpdateEvent];
+        else
+            [_queuedEvents addObject:cursorUpdateEvent];
+
+        _activeCursorTrackingArea = frontmostTrackingArea;
    }
 }

@@ -4181,7 +4267,7 @@ var interpolate = function(fromValue, toValue, progress)
            case CPMouseExited:
                [trackingOwner mouseExited:queuedEvent];
                break;
-                
+
            case CPCursorUpdate:
                [trackingOwner updateTrackingAreas];

@@ -55,6 +55,18 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
    id          _loadDelegate;
 }

+- (id)_initWithData:(CPData)data bundle:(CPBundle)aBundle cibName:(CPString)aCibName
+{
+    self = [super init];
+
+    _data = data;
+    _cibName = aCibName;
+    _bundle = aBundle;
+    _awakenCustomResources = YES;
+
+    return self;
+}
+
 - (id)initWithContentsOfURL:(CPURL)aURL
 {
    self = [super init];
@@ -1857,11 +1857,10 @@ function CPWindowObjectList()

 function CPWindowList()
 {
-    var windowObjectList = CPWindowObjectList(),
-        windowList = [];
+    var windowObjectList = CPWindowObjectList();

-    for (var i = 0, count = [windowObjectList count]; i < count; i++)
-        windowList.push([windowObjectList[i] windowNumber]);
-
-    return windowList;
+    return [windowObjectList arrayByApplyingBlock:function(windowObject)
+    {
+        return [windowObject windowNumber];
+    }];
 }
@@ -881,22 +881,22 @@ Returns a hash for the object. Unlike Cocoa, the hash value does not take conten
 }

 /*!
-    Returns an Array formed by applying a function to the objects in the receiver.
+    Returns an Array formed by applying a function to each object in the receiver.
    @param aFunction a function taking two arguments: (element, index).
    @return an Array containing the transformed elements.
 */
 - (CPArray)arrayByApplyingBlock:(Function/*element, index*/)aFunction
 {
-	var result = [],
-	    count = [self count];
+    var result = [],
+        count = [self count];

-	for (var idx = 0; idx < count; idx++)
-	{
-	    var obj = aFunction([self objectAtIndex:idx], idx);
-		[result addObject:obj];
-	}
+    for (var idx = 0; idx < count; idx++)
+    {
+        var obj = aFunction([self objectAtIndex:idx], idx);
+        [result addObject:obj];
+    }

-	return result;
+    return result;
 }

 // Creating a description of the array
@@ -235,15 +235,15 @@ var concat = Array.prototype.concat,

 - (CPArray)arrayByApplyingBlock:(Function/*element, index*/)aFunction
 {
-	var result = [];
+    var result = [];

-	for (var idx = 0; idx < self.length; idx++)
-	{
-	    var obj = aFunction(self[idx], idx);
-		result.push(obj);
-	}
+    for (var idx = 0; idx < self.length; idx++)
+    {
+        var obj = aFunction(self[idx], idx);
+        result.push(obj);
+    }

-	return result;
+    return result;
 }

 - (void)insertObject:(id)anObject atIndex:(CPUInteger)anIndex
@@ -763,13 +763,10 @@
 - (void)setAttributedString:(CPAttributedString)aString
 {
    _string = aString._string;
-    _rangeEntries = [];
-
-    var i = 0,
-        count = aString._rangeEntries.length;
-
-    for (; i < count; i++)
-        _rangeEntries.push(copyRangeEntry(aString._rangeEntries[i]));
+    _rangeEntries = [aString._rangeEntries arrayByApplyingBlock:function(entry)
+    {
+        return copyRangeEntry(entry);
+    }];
 }

 //Private methods
@@ -212,15 +212,12 @@ var CPBundlesForURLStrings = { };

 - (CPArray)staticResourceURLs
 {
-    var staticResourceURLs = [],
-        staticResources = _bundle.staticResources(),
-        index = 0,
-        count = [staticResources count];
+    var staticResources = _bundle.staticResources();

-    for (; index < count; ++index)
-        [staticResourceURLs addObject:staticResources[index].URL()];
-
-    return staticResourceURLs;
+    return [staticResources arrayByApplyingBlock:function(resource)
+    {
+        return resource.URL();
+    }];
 }

 - (CPArray)environments
@@ -1018,14 +1018,13 @@ var CPIndexSetCountKey              = @"CPIndexSetCountKey",
    if (self)
    {
        _count = [aCoder decodeIntForKey:CPIndexSetCountKey];
-        _ranges = [];

-        var rangeStrings = [aCoder decodeObjectForKey:CPIndexSetRangeStringsKey],
-            index = 0,
-            count = rangeStrings.length;
+        var rangeStrings = [aCoder decodeObjectForKey:CPIndexSetRangeStringsKey];

-        for (; index < count; ++index)
-            _ranges.push(CPRangeFromString(rangeStrings[index]));
+        _ranges = [rangeStrings arrayByApplyingBlock:function(range)
+        {
+            return CPRangeFromString(range);
+        }];
    }

    return self;
@@ -380,12 +380,10 @@ var _CPKeyedArchiverStringClass                         = Nil,
 /* @ignore */
 - (void)_encodeArrayOfObjects:(CPArray)objects forKey:(CPString)aKey
 {
-    var i = 0,
-        count = objects.length,
-        references = [];
-
-    for (; i < count; ++i)
-        [references addObject:_CPKeyedArchiverEncodeObject(self, objects[i], NO)];
+    var references = [objects arrayByApplyingBlock:function(object)
+    {
+        return _CPKeyedArchiverEncodeObject(self, object, NO);
+    }];

    [_plistObject setObject:references forKey:aKey];
 }
@@ -332,7 +332,7 @@ var CPArrayClass                                                            = Ni
 */
 - (id)decodeObjectForKey:(CPString)aKey
 {
-    var object = _plistObject.valueForKey(aKey),
+    var object = _plistObject && _plistObject.valueForKey(aKey),
        objectClass = (object != nil) && object.isa;

    if (objectClass === CPDictionaryClass || objectClass === CPMutableDictionaryClass)
@@ -25,6 +25,8 @@
@import "CPObject.j"
@import "CPObjJRuntime.j"

+#define CAST_TO_INT(x) ((x) >= 0 ? Math.floor((x)) : Math.ceil((x)))
+
 var CPNumberUIDs    = new CFMutableDictionary();

 /*!
@@ -239,6 +241,7 @@ FIXME: Do we need this?
 {
    if (typeof self == "boolean")
        return self ? 1 : 0;
+
    return self;
 }

@@ -246,35 +249,33 @@ FIXME: Do we need this?
 {
    if (typeof self == "boolean")
        return self ? 1 : 0;
+
    return self;
 }

 - (int)intValue
 {
-    if (typeof self == "boolean")
-        return self ? 1 : 0;
-    return self;
+    return CAST_TO_INT(self);
+}
+
+- (int)integerValue
+{
+    return CAST_TO_INT(self);
 }

 - (long long)longLongValue
 {
-    if (typeof self == "boolean")
-        return self ? 1 : 0;
-    return self;
+    return CAST_TO_INT(self);
 }

 - (long)longValue
 {
-    if (typeof self == "boolean")
-        return self ? 1 : 0;
-    return self;
+    return CAST_TO_INT(self);
 }

 - (short)shortValue
 {
-    if (typeof self == "boolean")
-        return self ? 1 : 0;
-    return self;
+    return CAST_TO_INT(self);
 }

 - (CPString)stringValue
@@ -289,9 +290,8 @@ FIXME: Do we need this?

 - (unsigned int)unsignedIntValue
 {
-    if (typeof self == "boolean")
-        return self ? 1 : 0;
-    return self;
+    // Despite the name this method does not make a negative value positive in Objective-C, so neither does it here.
+    return CAST_TO_INT(self);
 }
 /*
 - (unsigned long long)unsignedLongLongValue
@@ -302,16 +302,14 @@ FIXME: Do we need this?
 */
 - (unsigned long)unsignedLongValue
 {
-    if (typeof self == "boolean")
-        return self ? 1 : 0;
-    return self;
+    // Despite the name this method does not make a negative value positive in Objective-C, so neither does it here.
+    return CAST_TO_INT(self);
 }

 - (unsigned short)unsignedShortValue
 {
-    if (typeof self == "boolean")
-        return self ? 1 : 0;
-    return self;
+    // Despite the name this method does not make a negative value positive in Objective-C, so neither does it here.
+    return CAST_TO_INT(self);
 }

 - (CPComparisonResult)compare:(CPNumber)aNumber
@@ -28,3 +28,5 @@
@import "_CPAggregateExpression.j"
@import "_CPSetExpression.j"
@import "_CPSubqueryExpression.j"
+@import "_CPBlockExpression.j"
+@import "_CPConditionalExpression.j"
@@ -25,7 +25,7 @@

@implementation _CPAggregateExpression : CPExpression
 {
-    CPArray _aggregate;
+    CPArray _aggregate @accessors(getter=collection);
 }

 - (id)initWithAggregate:(CPArray)collection
@@ -34,6 +34,7 @@

    if (self)
        _aggregate = collection;
+
    return self;
 }

@@ -48,48 +49,30 @@
    return YES;
 }

- (id)collection
-{
-    return _aggregate;
-}
-
 - (id)expressionValueWithObject:(id)object context:(CPDictionary)context
 {
-    var eval_array = [CPArray array],
-        collection  = [_aggregate objectEnumerator],
-        exp;
-
-    while ((exp = [collection nextObject]) !== nil)
+    return [_aggregate arrayByApplyingBlock:function(exp)
    {
-        var eval = [exp expressionValueWithObject:object context:context];
-        [eval_array addObject:eval];
-    }
-
-    return eval_array;
+        return [exp expressionValueWithObject:object context:context];
+    }];
 }

 - (CPString)description
-{
-    var i = 0,
-        count = [_aggregate count],
-        result = "{";
+{    
+    var descriptions = [_aggregate arrayByApplyingBlock:function(exp)
+    {
+        return [exp description];
+    }];

-    for (; i < count; i++)
-        result = result + [CPString stringWithFormat:@"%s%s", [[_aggregate objectAtIndex:i] description], (i + 1 < count) ? @", " : @""];
-
-    result = result + "}";
-
-    return result;
+    return "{" + [descriptions componentsJoinedByString:","] + "}" ;
 }

 - (CPExpression)_expressionWithSubstitutionVariables:(CPDictionary)variables
 {
-    var subst_array = [CPArray array],
-        count = [_aggregate count],
-        i = 0;
-
-    for (; i < count; i++)
-        [subst_array addObject:[[_aggregate objectAtIndex:i] _expressionWithSubstitutionVariables:variables]];
+    var subst_array = [_aggregate arrayByApplyingBlock:function(exp)
+    {
+        return [exp _expressionWithSubstitutionVariables:variables];
+    }];

    return [CPExpression expressionForAggregate:subst_array];
 }
@@ -0,0 +1,79 @@
+/*
+ * _CPBlockExpression.j
+ *
+ * Created by cacaodev.
+ * Copyright 2015.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "_CPExpression.j"
+
+@implementation _CPBlockExpression :  CPExpression
+{
+    Function _block @accessors(getter=expressionBlock);
+    CPArray  _arguments @accessors(getter=arguments);
+}
+
+- (id)initWithBlock:(Function)aBlock arguments:(CPArray)arguments
+{
+    self = [super initWithExpressionType:CPBlockExpressionType];
+
+    if (self)
+    {
+        _block = aBlock;
+        _arguments = arguments;
+    }
+
+    return self;
+}
+
+- (BOOL)isEqual:(id)object
+{
+    if (self === object)
+        return YES;
+
+    if (object === nil || object.isa !== self.isa || [object expressionBlock] !== _block || ![[object arguments] isEqual:_arguments])
+        return NO;
+
+    return YES;
+}
+
+- (id)expressionValueWithObject:(id)object context:(CPDictionary)context
+{
+    var args = [_arguments arrayByApplyingBlock:function(exp)
+    {
+        return [exp expressionValueWithObject:object context:context];
+    }];
+
+    return _block(object, args, context);
+}
+
+- (CPExpression)_expressionWithSubstitutionVariables:(CPDictionary)bindings
+{
+    var args = [_arguments arrayByApplyingBlock:function(exp)
+    {
+        return [exp _expressionWithSubstitutionVariables:bindings];
+    }];
+
+    return [[_CPBlockExpression alloc] initWithBlock:_block arguments:args];
+}
+
+- (CPString)description
+{
+    return [CPString stringWithFormat:@"Block(function, %@)", [_arguments description]];
+}
+
+@end
@@ -0,0 +1,78 @@
+/*
+ * _CPConditionalExpression.j
+ *
+ * Created by cacaodev.
+ * Copyright 2015.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+@import "_CPPredicate.j"
+@import "_CPExpression.j"
+
+@implementation _CPConditionalExpression :  CPExpression
+{
+    CPPredicate   _predicate @accessors(getter=predicate);
+    CPExpression  _trueExpression @accessors(getter=trueExpression);
+    CPExpression  _falseExpression @accessors(getter=falseExpression);
+}
+
+- (id)initWithPredicate:(CPPredicate)aPredicate trueExpression:(CPExpression)trueExpression falseExpression:(CPExpression)falseExpression
+{
+    self = [super initWithExpressionType:CPConditionalExpressionType];
+
+    if (self)
+    {
+        _predicate = aPredicate;
+        _trueExpression = trueExpression;
+        _falseExpression = falseExpression;
+    }
+
+    return self;
+}
+
+- (BOOL)isEqual:(id)object
+{
+    if (self === object)
+        return YES;
+
+    if (object === nil || object.isa !== self.isa || ![[object predicate] isEqual:_predicate] || ![[object trueExpression] isEqual:_trueExpression] || ![[object falseExpression] isEqual:_falseExpression])
+        return NO;
+
+    return YES;
+}
+
+- (id)expressionValueWithObject:(id)object context:(CPDictionary)context
+{
+    var eval = [_predicate evaluateWithObject:object substitutionVariables:context],
+        exp = eval ? _trueExpression : _falseExpression;
+
+    return [exp expressionValueWithObject:object context:context];
+}
+
+- (CPExpression)_expressionWithSubstitutionVariables:(CPDictionary)bindings
+{
+    var predicate = [_predicate predicateWithSubstitutionVariables:bindings],
+        trueExp = [_trueExpression _expressionWithSubstitutionVariables:bindings],
+        falseExp = [_falseExpression _expressionWithSubstitutionVariables:bindings];
+
+    return [[_CPConditionalExpression alloc] initWithPredicate:predicate trueExpression:trueExp falseExpression:falseExp];
+}
+
+- (CPString)description
+{
+    return [CPString stringWithFormat:@"TERNARY(%@,%@,%@)", [_predicate predicateFormat], [_trueExpression description], [_falseExpression description]];
+}
+
+@end
@@ -27,7 +27,7 @@

@implementation _CPConstantValueExpression : CPExpression
 {
-    id _value;
+    id _value @accessors(getter=constantValue);
 }

 - (id)initWithValue:(id)value
@@ -51,11 +51,6 @@
    return YES;
 }

- (id)constantValue
-{
-    return _value;
-}
-
 - (id)expressionValueWithObject:(id)object context:(CPDictionary)context
 {
    return _value;
@@ -65,6 +65,14 @@ CPIntersectSetExpressionType    = 8;
    An expression that combines two nested expression results by set subtraction.
 */
 CPMinusSetExpressionType        = 9;
+/*!
+    An expression that returns the result of evaluating a block.
+*/
+CPBlockExpressionType           = 10;
+/*!
+    An expression that returns an expression that depends on the evaluation of a predicate.
+*/
+CPConditionalExpressionType     = 11;

 /*!
    @ingroup foundation
@@ -259,6 +267,32 @@ CPMinusSetExpressionType        = 9;
    return [[_CPSubqueryExpression alloc] initWithExpression:expression usingIteratorVariable:variable predicate:predicate];
 }

+/*!
+   Returns Creates an NSExpression object that will use the Block for evaluating objects.
+   @param aBlock The Block is applied to the object to be evaluated.
+
+The Block takes three arguments and returns a value:
+
+evaluatedObject
+The object to be evaluated.
+expressions
+An array of predicate expressions that evaluates to a collection.
+context
+A dictionary that the expression can use to store temporary state for one predicate evaluation.
+
+@discussion Note that context is mutable, and that it can only be accessed during the evaluation of the expression.
+@param arguments An array containing NSExpression objects that will be used as parameters during the invocation of the block.
+*/
+ (CPExpression)expressionForBlock:(Function)aBlock arguments:(CPArray)args
+{
+    return [[_CPBlockExpression alloc] initWithBlock:aBlock arguments:args];
+}
+
+ (CPExpression)expressionForConditional:(CPPredicate)aPredicate trueExpression:(CPExpression)trueExpression falseExpression:(CPExpression)falseExpression
+{
+    return [[_CPConditionalExpression alloc] initWithPredicate:aPredicate trueExpression:trueExpression falseExpression:falseExpression];
+}
+
 // Getting Information About an Expression
 /*!
    Returns the expression type for the receiver.
@@ -316,7 +350,7 @@ CPMinusSetExpressionType        = 9;

 /*!
    Returns the arguments for the receiver.
-    @return The arguments for the receiver—that is, the array of expressions that will be passed as parameters during invocation of the selector on the operand of a function expression.
+    @return The arguments for the receiver—that is, the array of expressions that will be passed as parameters during invocation of the selector on the operand of a function expression or as a parameter of the block of a block expression.
    This method raises an exception if it is not applicable to the receiver.
 */
 - (CPArray)arguments
@@ -337,8 +371,8 @@ CPMinusSetExpressionType        = 9;
 }

 /*!
-    Returns the predicate in a subquery expression.
-    @return The predicate in a subquery expression..
+    Returns the predicate in a subquery expression or a conditional expression.
+    @return The predicate in a subquery expression or a conditional expression.
    This method raises an exception if it is not applicable to the receiver.
 */
 - (CPPredicate)predicate
@@ -380,6 +414,39 @@ CPMinusSetExpressionType        = 9;
    return nil;
 }

+/*!
+    Returns the block of a block expression.
+    @return The block of a block expression.
+    This method raises an exception if it is not applicable to the receiver.
+*/
+- (Function)expressionBlock
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+    return nil;
+}
+
+/*!
+    Returns the true expression of a conditional expression.
+    @return The true expression of a conditional expression.
+    This method raises an exception if it is not applicable to the receiver.
+*/
+- (CPExpression)trueExpression
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+    return nil;
+}
+
+/*!
+    Returns the false expression of a conditional expression.
+    @return The false expression of a conditional expression.
+    This method raises an exception if it is not applicable to the receiver.
+*/
+- (CPExpression)falseExpression
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+    return nil;
+}
+
 - (CPExpression)_expressionWithSubstitutionVariables:(CPDictionary)variables
 {
    return self;
@@ -28,9 +28,9 @@

@implementation _CPFunctionExpression : CPExpression
 {
-    CPExpression    _operand;
+    CPExpression    _operand @accessors(getter=operand);
    SEL             _selector;
-    CPArray         _arguments;
+    CPArray         _arguments @accessors(getter=arguments);
    int             _argc;
    int             _maxargs;
 }
@@ -88,16 +88,6 @@
    return [self _function];
 }

- (CPArray)arguments
-{
-    return _arguments;
-}
-
- (CPExpression)operand
-{
-    return _operand;
-}
-
 - (id)expressionValueWithObject:(id)object context:(CPDictionary)context
 {
    var target = [_operand expressionValueWithObject:object context:context],
@@ -143,11 +133,10 @@
 - (CPExpression)_expressionWithSubstitutionVariables:(CPDictionary)variables
 {
    var operand = [[self operand] _expressionWithSubstitutionVariables:variables],
-        args = [CPArray array],
-        i = 0;
-
-    for (; i < _argc; i++)
-        [args addObject:[_arguments[i] _expressionWithSubstitutionVariables:variables]];
+        args = [_arguments arrayByApplyingBlock:function(arg)
+        {
+            return [arg _expressionWithSubstitutionVariables:variables];
+        }];

    return [CPExpression expressionForFunction:operand selectorName:[self _function] arguments:args];
 }
@@ -744,16 +744,43 @@

        if (![self scanString:@"," intoString:NULL])
            CPRaiseParseError(self, @"expression");
+
        variableExpression = [self parseExpression];

        if (![self scanString:@"," intoString:NULL])
            CPRaiseParseError(self, @"expression");
+
        subpredicate = [self parsePredicate];

+        if (![self scanString:@")" intoString:NULL])
+            CPRaiseParseError(self, @"predicate");
+
+        return [[_CPSubqueryExpression alloc] initWithExpression:collection usingIteratorExpression:variableExpression predicate:subpredicate];
+    }
+
+    if ([self scanString:@"TERNARY" intoString:NULL])
+    {
+        if (![self scanString:@"(" intoString:NULL])
+            CPRaiseParseError(self, @"expression");
+
+        var predicate = [self parsePredicate],
+            trueExpression,
+            falseExpression;
+
+        if (![self scanString:@"," intoString:NULL])
+            CPRaiseParseError(self, @"predicate");
+
+        trueExpression = [self parseExpression];
+
+        if (![self scanString:@"," intoString:NULL])
+            CPRaiseParseError(self, @"expression");
+
+        falseExpression = [self parseExpression];
+
        if (![self scanString:@")" intoString:NULL])
            CPRaiseParseError(self, @"expression");

-        return [[_CPSubqueryExpression alloc] initWithExpression:collection usingIteratorExpression:variableExpression predicate:subpredicate];
+        return [CPExpression expressionForConditional:predicate trueExpression:trueExpression falseExpression:falseExpression];
    }

    if ([self scanString:@"FUNCTION" intoString:NULL])
@@ -25,8 +25,8 @@

@implementation _CPSetExpression : CPExpression
 {
-    CPExpression _left;
-    CPExpression _right;
+    CPExpression _left  @accessors(getter=leftExpression);
+    CPExpression _right @accessors(getter=rightExpression);
 }

 - (id)initWithType:(int)type left:(CPExpression)left right:(CPExpression)right
@@ -88,16 +88,6 @@
    return self;
 }

- (CPExpression)leftExpression
-{
-    return _left;
-}
-
- (CPExpression)rightExpression
-{
-    return _right;
-}
-
 - (CPString)description
 {
    var desc;
@@ -26,9 +26,9 @@

@implementation _CPSubqueryExpression : CPExpression
 {
-    CPExpression _collection;
+    CPExpression _collection @accessors(getter=collection);
    CPExpression _variableExpression;
-    CPPredicate  _subpredicate;
+    CPPredicate  _subpredicate @accessors(getter=predicate);
 }

 - (id)initWithExpression:(CPExpression)collection usingIteratorVariable:(CPString)variable predicate:(CPPredicate)subpredicate
@@ -81,21 +81,11 @@
    return YES;
 }

- (CPExpression)collection
-{
-    return _collection;
-}
-
 - (id)copy
 {
    return [[_CPSubqueryExpression alloc] initWithExpression:[_collection copy] usingIteratorExpression:[_variableExpression copy] predicate:[_subpredicate copy]];
 }

- (CPPredicate)predicate
-{
-    return _subpredicate;
-}
-
 - (CPString)description
 {
    return [self predicateFormat];
@@ -29,7 +29,7 @@

@implementation _CPVariableExpression :  CPExpression
 {
-    CPString _variable;
+    CPString _variable @accessors(getter=variable);
 }

 - (id)initWithVariable:(CPString)variable
@@ -54,11 +54,6 @@
    return YES;
 }

- (CPString)variable
-{
-    return _variable;
-}
-
 - (id)expressionValueWithObject:object context:(CPDictionary)context
 {
    var expression = [self _expressionWithSubstitutionVariables:context];
@@ -731,6 +731,14 @@ var CPStringNull = [CPNull null];
    return parseInt(self, 10);
 }

+/*!
+    Returns the text as an integer
+*/
+- (int)integerValue
+{
+    return parseInt(self, 10);
+}
+
 /*!
    Returns an the path components of this string. This
    method assumes that the string's content is a '/'
@@ -209,16 +209,16 @@ Executable.prototype.setCode = function(code)
    {
 #endif
 #if DEBUG
-    // "//@ sourceURL=" at the end lets us name our eval'd files for debuggers, etc.
+    // "//# sourceURL=" at the end lets us name our eval'd files for debuggers, etc.
    // * WebKit:  http://pmuellr.blogspot.com/2009/06/debugger-friendly.html
    // * Firebug: http://blog.getfirebug.com/2009/08/11/give-your-eval-a-name-with-sourceurl/
    //if (YES) {
        var absoluteString = this.URL().absoluteString();

-        code += "/**/\n//@ sourceURL=" + absoluteString;
+        code += "/**/\n//# sourceURL=" + absoluteString;
    //} else {
    //    // Firebug only does it for "eval()", not "new Function()". Ugh. Slower.
-    //    var functionText = "(function(){"+GET_CODE(aFragment)+"/**/\n})\n//@ sourceURL="+GET_FILE(aFragment).path;
+    //    var functionText = "(function(){"+GET_CODE(aFragment)+"/**/\n})\n//# sourceURL="+GET_FILE(aFragment).path;
    //    compiled = eval(functionText);
    //}
 #endif
@@ -32,7 +32,7 @@ $BROWSER_FILE       = FILE.join("Browser", "Objective-J.js");
 $BUILD_OBJECTIVE_J  = FILE.join($BUILD_CONFIGURATION_DIR, "Objective-J");
 $BUILD_BROWSER_FILE = FILE.join($BUILD_OBJECTIVE_J, "Objective-J.js");

-$INCLUDE_FLAGS      = ["-I" + FILE.cwd()];
+$INCLUDE_FLAGS      = ["'-I" + FILE.cwd() + "'"];
 $DEBUG_FLAGS        = $CONFIGURATION === "Debug" ? ["-DDEBUG=1"] : [""];
 $OBJECTIVEJ_FILES   = new FileList("*.js");

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/cappuccino/cappuccino.svg?branch=master)](https://travis-ci.org/cappuccino/cappuccino)
+[![Build Status](https://travis-ci.org/cappuccino/cappuccino.svg?branch=master)](https://travis-ci.org/cappuccino/cappuccino) [![Join the chat at https://gitter.im/cappuccino/cappuccino](https://badges.gitter.im/cappuccino/cappuccino.svg)](https://gitter.im/cappuccino/cappuccino?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

 Welcome to Cappuccino!
 ======================
@@ -15,7 +15,7 @@ with the complexities of traditional web technologies like HTML, CSS, or even
 the DOM. The unpleasantries of building complex cross browser applications are
 abstracted away for you.

-For more information, see <http://cappuccino-project.org>.
+For more information, see <http://cappuccino-project.org>. Follow [@cappuccino](https://twitter.com/cappuccino) on Twitter for updates on the project.

 System Requirements
 -------------------
@@ -35,7 +35,7 @@ Getting Started
 ---------------
 To get started, download and install the current release version of Cappuccino:

-    $ curl https://raw.githubusercontent.com/cappuccino/cappuccino/v0.9.8/bootstrap.sh >/tmp/cappuccino_bootstrap.sh && bash /tmp/cappuccino_bootstrap.sh
+    $ curl https://raw.githubusercontent.com/cappuccino/cappuccino/v0.9.9/bootstrap.sh >/tmp/cappuccino_bootstrap.sh && bash /tmp/cappuccino_bootstrap.sh

 If you'd just like to get started using Cappuccino for your web apps, you are done.

@@ -1127,34 +1127,32 @@ var updateTrackingAreasCalls,

    // Complex test for cursor update frontmost tracking area detection

-    var viewA = [[CPTrackingAreaView alloc] initWithFrame:CGRectMake(0, 30, 40, 40)];
-    var viewB = [[CPTrackingAreaView alloc] initWithFrame:CGRectMake(30, 20, 40, 40)];
-    var viewC = [[CPTrackingAreaView alloc] initWithFrame:CGRectMake(10, 0, 40, 40)];
+    var viewA = [[CPTrackingAreaView alloc] initWithFrame:CGRectMake(0, 30, 40, 40)],
+        viewB = [[CPTrackingAreaView alloc] initWithFrame:CGRectMake(30, 20, 40, 40)],
+        viewC = [[CPTrackingAreaView alloc] initWithFrame:CGRectMake(10, 0, 40, 40)];

    [contentView setSubviews:[CPArray array]];
    [contentView addSubview:viewA];
    [contentView addSubview:viewB];
    [contentView addSubview:viewC];

-    var subviewA = [[CPTrackingAreaView alloc] initWithFrame:CGRectMake(20, 0, 20, 20)];
-    var subviewB = [[CPTrackingAreaView alloc] initWithFrame:CGRectMake(0, 0, 20, 20)];
-    var subviewC = [[CPTrackingAreaView alloc] initWithFrame:CGRectMake(0, 20, 40, 20)];
+    var subviewA = [[CPTrackingAreaView alloc] initWithFrame:CGRectMake(20, 0, 20, 20)],
+        subviewB = [[CPTrackingAreaView alloc] initWithFrame:CGRectMake(0, 0, 20, 20)],
+        subviewC = [[CPTrackingAreaView alloc] initWithFrame:CGRectMake(0, 20, 40, 20)];

    [viewA addSubview:subviewA];
    [viewB addSubview:subviewB];
    [viewC addSubview:subviewC];

-    var options  = CPTrackingCursorUpdate | CPTrackingActiveInActiveApp | CPTrackingInVisibleRect;
-    var options2 = CPTrackingMouseEnteredAndExited | CPTrackingActiveInActiveApp | CPTrackingInVisibleRect;
-    var options3 = CPTrackingCursorUpdate | CPTrackingActiveInActiveApp;
-
-    var viewATrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:options  owner:viewA userInfo:nil];
-    var viewBTrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:options  owner:viewB userInfo:nil];
-    var viewCTrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:options2 owner:viewC userInfo:nil];
-
-    var subviewATrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero()          options:options  owner:subviewA userInfo:nil];
-    var subviewBTrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero()          options:options  owner:subviewB userInfo:nil];
-    var subviewCtrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMake(20, 0, 20, 20) options:options3 owner:subviewC userInfo:nil];
+    var options              = CPTrackingCursorUpdate | CPTrackingActiveInActiveApp | CPTrackingInVisibleRect,
+        options2             = CPTrackingMouseEnteredAndExited | CPTrackingActiveInActiveApp | CPTrackingInVisibleRect,
+        options3             = CPTrackingCursorUpdate | CPTrackingActiveInActiveApp,
+        viewATrackingArea    = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:options  owner:viewA userInfo:nil],
+        viewBTrackingArea    = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:options  owner:viewB userInfo:nil],
+        viewCTrackingArea    = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:options2 owner:viewC userInfo:nil],
+        subviewATrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero()          options:options  owner:subviewA userInfo:nil],
+        subviewBTrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero()          options:options  owner:subviewB userInfo:nil],
+        subviewCtrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMake(20, 0, 20, 20) options:options3 owner:subviewC userInfo:nil];

    [viewA addTrackingArea:viewATrackingArea];
    [viewB addTrackingArea:viewBTrackingArea];
@@ -1222,18 +1220,18 @@ var updateTrackingAreasCalls,

    // Cursor tests

-    var viewA = [[CPTrackingAreaViewWithCursorUpdate alloc] initWithFrame:CGRectMake(20, 20, 40, 40)];
-    var viewB = [[CPTrackingAreaView alloc] initWithFrame:CGRectMake(10, 10, 80, 80)];
-    var viewC = [[CPTrackingAreaViewWithoutCursorUpdate alloc] initWithFrame:CGRectMake(10, 10, 80, 80)];
+    var viewA = [[CPTrackingAreaViewWithCursorUpdate alloc] initWithFrame:CGRectMake(20, 20, 40, 40)],
+        viewB = [[CPTrackingAreaView alloc] initWithFrame:CGRectMake(10, 10, 80, 80)],
+        viewC = [[CPTrackingAreaViewWithoutCursorUpdate alloc] initWithFrame:CGRectMake(10, 10, 80, 80)];

    [contentView setSubviews:[CPArray array]];
    [contentView addSubview:viewA];

    var options  = CPTrackingCursorUpdate | CPTrackingActiveInActiveApp | CPTrackingInVisibleRect;

-    var viewATrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:options owner:viewA userInfo:nil];
-    var viewBTrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:options owner:viewB userInfo:nil];
-    var viewCTrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:options owner:viewC userInfo:nil];
+    var viewATrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:options owner:viewA userInfo:nil],
+        viewBTrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:options owner:viewB userInfo:nil],
+        viewCTrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:options owner:viewC userInfo:nil];

    [viewA addTrackingArea:viewATrackingArea];
    [viewB addTrackingArea:viewBTrackingArea];
@@ -1360,6 +1358,141 @@ var updateTrackingAreasCalls,
    
 }

+- (void)testTrackingAreasLiveViewHierarchyModification
+{
+    // 1. viewB inside viewA with mouseEntered removing itself
+
+    var viewA = [[CPTrackingAreaViewWithCursorUpdate alloc] initWithFrame:CGRectMake(20, 20, 40, 40)]
+        viewB = [[CPTrackingAreaViewLiveRemoval      alloc] initWithFrame:CGRectMake(10, 10, 20, 20)];
+
+    [[window contentView] setSubviews:[CPArray arrayWithObject:viewA]];
+    [viewA addSubview:viewB];
+
+    var options           = CPTrackingMouseEnteredAndExited | CPTrackingCursorUpdate | CPTrackingActiveInActiveApp | CPTrackingInVisibleRect,
+        viewATrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:options owner:viewA userInfo:nil],
+        viewBTrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:options owner:viewB userInfo:nil];
+
+    [viewA addTrackingArea:viewATrackingArea];
+    [viewB addTrackingArea:viewBTrackingArea];
+
+    // Step 1.1 : enter viewA
+
+    [self moveMouseAtPoint:CGPointMake(25, 25) dragging:NO];
+
+    [self assert:1 equals:mouseEnteredCalls message:@"1.1 There should be one and only one mouseEntered call"];
+    [self assert:0 equals:mouseExitedCalls  message:@"1.1 There should be no mouseExited call"];
+    [self assert:0 equals:mouseMovedCalls   message:@"1.1 There should be no mouseMoved call"];
+    [self assert:1 equals:cursorUpdateCalls message:@"1.1 There should be one and only one cursorUpdate call"];
+
+    [self assert:viewA equals:involvedViewForMouseEntered message:@"1.1 viewA should receive mouseEntered"];
+    [self assert:viewA equals:involvedViewForCursorUpdate message:@"1.1 viewA should receive cursorUpdate"];
+
+    // Step 1.2 : enter viewB
+
+    [self moveMouseAtPoint:CGPointMake(40, 40) dragging:NO];
+
+    [self assert:1 equals:mouseEnteredCalls message:@"1.2 There should be one and only one mouseEntered call"];
+    [self assert:0 equals:mouseExitedCalls  message:@"1.2 There should be no mouseExited call"];
+    [self assert:0 equals:mouseMovedCalls   message:@"1.2 There should be no mouseMoved call"];
+    [self assert:0 equals:cursorUpdateCalls message:@"1.2 There should be no cursorUpdate call"];
+
+    [self assert:viewB equals:involvedViewForMouseEntered message:@"1.2 viewB should receive mouseEntered"];
+
+    // Step 1.3 : move back to viewA (there should be no more viewB)
+
+    [self moveMouseAtPoint:CGPointMake(25, 25) dragging:NO];
+
+    [self assert:0 equals:mouseEnteredCalls message:@"1.3 There should be no mouseEntered call"];
+    [self assert:0 equals:mouseExitedCalls  message:@"1.3 There should be no mouseExited call"];
+    [self assert:0 equals:mouseMovedCalls   message:@"1.3 There should be no mouseMoved call"];
+    [self assert:1 equals:cursorUpdateCalls message:@"1.3 There should be one and only one cursorUpdate call"];
+
+    [self assert:viewA equals:involvedViewForCursorUpdate message:@"1.3 viewA should receive cursorUpdate"];
+
+    // Step 1.4 : exit viewA
+
+    [self moveMouseAtPoint:CGPointMake(5, 5) dragging:NO];
+
+    [self assert:0 equals:mouseEnteredCalls message:@"1.4 There should be one and only one mouseEntered call"];
+    [self assert:1 equals:mouseExitedCalls  message:@"1.4 There should be one and only on mouseExited call"];
+    [self assert:0 equals:mouseMovedCalls   message:@"1.4 There should be no mouseMoved call"];
+    [self assert:0 equals:cursorUpdateCalls message:@"1.4 There should be no cursorUpdate call"];
+
+    [self assert:viewA equals:involvedViewForMouseExited message:@"1.4 viewA should receive mouseExited"];
+
+    // 2. viewA with mouseEntered adding viewB inside it. Testing if viewB receive mouseEntered & cursorUpdate
+
+    var viewA = [[CPTrackingAreaViewLiveAddition alloc] initWithFrame:CGRectMake(20, 20, 40, 40)];
+
+    [[window contentView] setSubviews:[CPArray arrayWithObject:viewA]];
+
+    var options           = CPTrackingMouseEnteredAndExited | CPTrackingCursorUpdate | CPTrackingActiveInActiveApp | CPTrackingInVisibleRect,
+        viewATrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:options owner:viewA userInfo:nil];
+
+    [viewA addTrackingArea:viewATrackingArea];
+
+    // Step 2.1 : enter viewA (then add viewB thus enter also viewB)
+
+    [self moveMouseAtPoint:CGPointMake(25, 25) dragging:NO];
+
+    [self assert:2 equals:mouseEnteredCalls message:@"2.1 There should be two mouseEntered calls"];
+    [self assert:0 equals:mouseExitedCalls  message:@"2.1 There should be no mouseExited call"];
+    [self assert:0 equals:mouseMovedCalls   message:@"2.1 There should be no mouseMoved call"];
+    [self assert:2 equals:cursorUpdateCalls message:@"2.1 There should be two cursorUpdate calls"];
+
+    [self assert:[[viewA subviews] firstObject] equals:involvedViewForMouseEntered message:@"2.1 viewB should receive mouseEntered"];
+    [self assert:[[viewA subviews] firstObject] equals:involvedViewForCursorUpdate message:@"2.1 viewB should receive cursorUpdate"];
+    [self assert:[CPCursor crosshairCursor]     equals:[CPCursor currentCursor]    message:@"2.1 Final cursor should be crosshair cursor, determined by viewB"];
+
+    // Step 2.2 : exit viewA (thus also viewB)
+
+    [self moveMouseAtPoint:CGPointMake(5, 5) dragging:NO];
+
+    [self assert:0 equals:mouseEnteredCalls message:@"2.2 There should be no mouseEntered calls"];
+    [self assert:2 equals:mouseExitedCalls  message:@"2.2 There should be two mouseExited call"];
+    [self assert:0 equals:mouseMovedCalls   message:@"2.2 There should be no mouseMoved call"];
+    [self assert:0 equals:cursorUpdateCalls message:@"2.2 There should be no cursorUpdate calls"];
+
+    [self assert:[[viewA subviews] firstObject] equals:involvedViewForMouseExited message:@"2.2 viewB should receive mouseExited"];
+    [self assert:[CPCursor arrowCursor]         equals:[CPCursor currentCursor]   message:@"2.2 Cursor should be an arrow"];
+
+    // 3. viewA with mouseEntered adding viewB inside it BUT with CPTrackingAssumeInside. Testing if viewB receive only cursorUpdate
+
+    var viewA = [[CPTrackingAreaViewLiveAddition2 alloc] initWithFrame:CGRectMake(20, 20, 40, 40)];
+
+    [[window contentView] setSubviews:[CPArray arrayWithObject:viewA]];
+
+    var options           = CPTrackingMouseEnteredAndExited | CPTrackingCursorUpdate | CPTrackingActiveInActiveApp | CPTrackingInVisibleRect,
+        viewATrackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:options owner:viewA userInfo:nil];
+
+    [viewA addTrackingArea:viewATrackingArea];
+
+    // Step 3.1 : enter viewA (then add viewB thus enter also viewB)
+
+    [self moveMouseAtPoint:CGPointMake(25, 25) dragging:NO];
+
+    [self assert:1 equals:mouseEnteredCalls message:@"3.1 There should be two mouseEntered calls"];
+    [self assert:0 equals:mouseExitedCalls  message:@"3.1 There should be no mouseExited call"];
+    [self assert:0 equals:mouseMovedCalls   message:@"3.1 There should be no mouseMoved call"];
+    [self assert:2 equals:cursorUpdateCalls message:@"3.1 There should be two cursorUpdate calls"];
+
+    [self assert:viewA                          equals:involvedViewForMouseEntered message:@"3.1 viewB should receive mouseEntered"];
+    [self assert:[[viewA subviews] firstObject] equals:involvedViewForCursorUpdate message:@"3.1 viewB should receive cursorUpdate"];
+    [self assert:[CPCursor crosshairCursor]     equals:[CPCursor currentCursor]    message:@"3.1 Final cursor should be crosshair cursor, determined by viewB"];
+
+    // Step 3.2 : exit viewA (thus also viewB)
+
+    [self moveMouseAtPoint:CGPointMake(5, 5) dragging:NO];
+
+    [self assert:0 equals:mouseEnteredCalls message:@"3.2 There should be no mouseEntered calls"];
+    [self assert:2 equals:mouseExitedCalls  message:@"3.2 There should be two mouseExited call"];
+    [self assert:0 equals:mouseMovedCalls   message:@"3.2 There should be no mouseMoved call"];
+    [self assert:0 equals:cursorUpdateCalls message:@"3.2 There should be no cursorUpdate calls"];
+
+    [self assert:[[viewA subviews] firstObject] equals:involvedViewForMouseExited message:@"3.2 viewB should receive mouseExited"];
+    [self assert:[CPCursor arrowCursor]         equals:[CPCursor currentCursor]   message:@"3.2 Cursor should be an arrow"];
+}
+
 - (void)updateTrackingAreas
 {
    updateTrackingAreasCalls++;
@@ -1414,21 +1547,16 @@ var updateTrackingAreasCalls,
@end

@implementation CPTrackingAreaView : CPView
-{
-
-}

 - (void)mouseEntered:(CPEvent)anEvent
 {
    mouseEnteredCalls++;
-
    involvedViewForMouseEntered = [[anEvent trackingArea] view];
 }

 - (void)mouseExited:(CPEvent)anEvent
 {
    mouseExitedCalls++;
-
    involvedViewForMouseExited = [[anEvent trackingArea] view];
 }

@@ -1440,7 +1568,6 @@ var updateTrackingAreasCalls,
 - (void)cursorUpdate:(CPEvent)anEvent
 {
    cursorUpdateCalls++;
-
    involvedViewForCursorUpdate = [[anEvent trackingArea] view];
 }

@@ -1452,22 +1579,73 @@ var updateTrackingAreasCalls,
@end

@implementation CPTrackingAreaViewWithCursorUpdate : CPTrackingAreaView
-{
-
-}

 - (void)cursorUpdate:(CPEvent)anEvent
 {
    [[CPCursor crosshairCursor] set];
-
    [super cursorUpdate:anEvent];
 }

@end

@implementation CPTrackingAreaViewWithoutCursorUpdate : CPView
-{

+@end
+
+@implementation CPTrackingAreaViewLiveRemoval : CPTrackingAreaView
+
+- (void)cursorUpdate:(CPEvent)anEvent
+{
+    [[CPCursor pointingHandCursor] set];
+    [super cursorUpdate:anEvent];
+}
+
+- (void)mouseEntered:(CPEvent)anEvent
+{
+    [self removeFromSuperview];
+    [super mouseEntered:anEvent];
+}
+
+@end
+
+@implementation CPTrackingAreaViewLiveAddition : CPTrackingAreaView
+
+- (void)cursorUpdate:(CPEvent)anEvent
+{
+    [[CPCursor pointingHandCursor] set];
+    [super cursorUpdate:anEvent];
+}
+
+- (void)mouseEntered:(CPEvent)anEvent
+{
+    var viewB = [[CPTrackingAreaViewWithCursorUpdate alloc] initWithFrame:CGRectMake(0, 0, 40, 40)];
+
+    [self addSubview:viewB];
+
+    [viewB addTrackingArea:[[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:CPTrackingMouseEnteredAndExited | CPTrackingCursorUpdate | CPTrackingActiveInActiveApp | CPTrackingInVisibleRect owner:viewB userInfo:nil]];
+
+    [super mouseEntered:anEvent];
+}
+
+@end
+
+@implementation CPTrackingAreaViewLiveAddition2 : CPTrackingAreaView
+
+- (void)cursorUpdate:(CPEvent)anEvent
+{
+    [[CPCursor pointingHandCursor] set];
+    [super cursorUpdate:anEvent];
+}
+
+- (void)mouseEntered:(CPEvent)anEvent
+{
+    var viewB = [[CPTrackingAreaViewWithCursorUpdate alloc] initWithFrame:CGRectMake(0, 0, 40, 40)];
+
+    [self addSubview:viewB];
+
+    [viewB addTrackingArea:[[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:CPTrackingMouseEnteredAndExited | CPTrackingCursorUpdate | CPTrackingActiveInActiveApp | CPTrackingInVisibleRect | CPTrackingAssumeInside owner:viewB userInfo:nil]];
+
+    [super mouseEntered:anEvent];
 }

@end
@@ -12,4 +12,45 @@
    [self assertThrows:function () { [34 compare:[CPNull null]] }];
 }

+- (void)testIntValue
+{
+    /*
+    For reference:
+
+        [[NSNumber numberWithDouble:3.1] intValue]: 3
+        [[NSNumber numberWithDouble:3.9] intValue]: 3
+        [[NSNumber numberWithDouble:-3.1] intValue]: -3
+        [[NSNumber numberWithDouble:-3.9] intValue]: -3
+        [[NSNumber numberWithDouble:3.1] integerValue]: 3
+        [[NSNumber numberWithDouble:3.9] integerValue]: 3
+        [[NSNumber numberWithDouble:-3.1] integerValue]: -3
+        [[NSNumber numberWithDouble:-3.9] integerValue]: -3
+    */
+
+    var testStrings = [
+//            [090,   90],   // Removed cause Rhino does not support numbers starting with '0'
+            [-1,      -1],
+            [3.1415,   3],
+            [3.5415,   3],
+            [-3.1415, -3],
+            [-3.5415, -3],
+            [2.7183,   2],
+            [-0,       0],
+            [00,       0],
+            [-00,      0],
+            [+001,     1],
+        ];
+
+    for (var i = 0; i < testStrings.length; i++)
+        [self assert:[testStrings[i][0] shortValue] equals:testStrings[i][1]];
+    for (var i = 0; i < testStrings.length; i++)
+        [self assert:[testStrings[i][0] intValue] equals:testStrings[i][1]];
+    for (var i = 0; i < testStrings.length; i++)
+        [self assert:[testStrings[i][0] longValue] equals:testStrings[i][1]];
+    for (var i = 0; i < testStrings.length; i++)
+        [self assert:[testStrings[i][0] longLongValue] equals:testStrings[i][1]];
+    for (var i = 0; i < testStrings.length; i++)
+        [self assert:[testStrings[i][0] integerValue] equals:testStrings[i][1]];
+}
+
@end
@@ -79,6 +79,17 @@

    var expression_minusset = [CPExpression expressionForMinusSet:set with:array];
    [self assertNotNull:expression_minusset message:"MinusSet Expression should not be nil"];
+
+    var expression_block = [CPExpression expressionForBlock:function(obj, args, bindings)
+    {
+        return obj;
+    } arguments:nil];
+
+    [self assertNotNull:expression_block message:"Block Expression should not be nil"];
+
+    var expression_conditional = [CPExpression expressionForConditional:[CPPredicate predicateWithValue:YES] trueExpression:expression_minusset falseExpression:expression_block];
+
+    [self assertNotNull:expression_conditional message:"Conditional Expression should not be nil"];
 }

 - (void)testSetExpressionEvaluation
@@ -147,6 +158,27 @@
    [self assertTrue:([eval isEqual:expected]) message:"'" + [expression predicateFormat]  + "' result is "+ eval + "but should be " + expected];
 }

+- (void)testBlockExpressionEvaluation
+{
+    var block = function(obj, args, bindings)
+    {
+        return [obj stringByAppendingString:[args componentsJoinedByString:"-"]];
+    };
+
+    var expression = [CPExpression expressionForBlock:block arguments:[[CPExpression expressionForConstantValue:"A"], [CPExpression expressionForConstantValue:"B"]]];
+
+    var eval = [expression expressionValueWithObject:"OBJ" context:@{}];
+    [self assertTrue:([eval isEqual:"OBJA-B"]) message:"'" + [expression description]  + "' result is "+ eval + "but should be " + "OBJA-B"];
+}
+
+- (void)testConditionalExpressionEvaluation
+{
+    var expression = [CPExpression expressionForConditional:[CPPredicate predicateWithFormat:"SELF = $variable"] trueExpression:[CPExpression expressionForConstantValue:"TRUE_EXP"] falseExpression:[CPExpression expressionForConstantValue:"FALSE_EXP"]];
+
+    var eval = [expression expressionValueWithObject:"OBJ" context:@{"variable":"OBJ"}];
+    [self assertTrue:([eval isEqual:"TRUE_EXP"]) message:"'" + [expression description]  + "' result is "+ eval + "but should be " + "TRUE_EXP"];
+}
+
 - (void)testOptions
 {
    var pred = [[CPComparisonPredicate alloc] initWithLeftExpression:[CPExpression expressionForConstantValue:@"àa"] rightExpression:[CPExpression expressionForConstantValue:@"aà"] modifier:CPDirectPredicateModifier type:CPLikePredicateOperatorType options:3];
@@ -381,6 +413,9 @@
    predicate = [CPPredicate predicateWithFormat:@"a UNION {'b'} = {'a','b'}"];
    var left = [[predicate leftExpression] expressionValueWithObject:object context:nil];
    [self assertTrue:[left isEqualToSet:result] message:"Expression eval " + left + " should be " + result];
+
+    predicate = [CPPredicate predicateWithFormat:@"TERNARY(Record1.Children[SIZE] = 1, 'Single', Record1.Name) = 'John'"];
+    [self assertTrue:[predicate evaluateWithObject:dict] message:"Predicate " + predicate + " should evaluate to TRUE"];
 }

 - (void)testExpressionAndPredicateIsEqual
@@ -439,6 +474,10 @@
    pred1 = [CPPredicate predicateWithFormat:@"a = 'a' AND b = 'b'"];
    pred2 = [CPPredicate predicateWithFormat:@"a = 'a' AND b = 'b'"];
    [self assert:pred1 equals:pred2];
+
+    pred1 = [CPPredicate predicateWithFormat:@"TERNARY(Record1.Children[FIRST] BEGINSWITH Record1.Name, 'SAME', 'DIFFERENT') = 'DIFFERENT'"];
+    pred2 = [CPPredicate predicateWithFormat:@"TERNARY(Record1.Children[FIRST] BEGINSWITH Record1.Name, 'SAME', 'DIFFERENT') = 'DIFFERENT'"];
+    [self assert:pred1 equals:pred2];
 }

 - (void)testExpressionAndPredicateIsNotEqualToNil
@@ -490,6 +529,10 @@

    [self assert:pred1 notEqual:nil];

+    pred1 = [CPPredicate predicateWithFormat:@"TERNARY(Record1.Children[FIRST] BEGINSWITH Record1.Name, 'SAME', 'DIFFERENT') = 'DIFFERENT'"];
+
+    [self assert:pred1 notEqual:nil];
+
    pred1 = [CPPredicate predicateWithFormat:@"$x CONTAINS 'a'"];

    [self assert:pred1 notEqual:nil];
@@ -165,6 +165,25 @@
        [self assert:[testStrings[i][0] boolValue] equals:testStrings[i][1]];
 }

+- (void)testintValue
+{
+    var testStrings = [
+            ["  090",   90],
+            ["  -1",    -1],
+            ["  3.1415", 3],
+            ["  2.7183", 2],
+            ["  -0",     0],
+            ["  00",     0],
+            ["  -00",    0],
+            ["  +001",   1],
+        ];
+
+    for (var i = 0; i < testStrings.length; i++)
+        [self assert:[testStrings[i][0] intValue] equals:testStrings[i][1]];
+    for (var i = 0; i < testStrings.length; i++)
+        [self assert:[testStrings[i][0] integerValue] equals:testStrings[i][1]];
+}
+
 - (void)testCommonPrefixWithString
 {
    var testStringsCase = [
@@ -29,7 +29,7 @@
    [arrayController setContent:items];

    var label = [CPTextField labelWithTitle:@"Press buttons to see [Remove First By Object] fails while [Remove First By Index] succeeds"];
-    [label setFrameOrigin:CGPointMake(20, 20)];    
+    [label setFrameOrigin:CGPointMake(20, 20)];
    [contentView addSubview:label];

    var field = [CPTextField textFieldWithStringValue:@"" placeholder:@"" width:100];
@@ -65,7 +65,8 @@

 - (void)removeFirstByIndex:(id)sender
 {
-    [arrayController removeObjectAtArrangedObjectIndex:0];
+    if ([[arrayController contentArray] count])
+        [arrayController removeObjectAtArrangedObjectIndex:0];
 }

 - (void)observeValueForKeyPath:(CPString)keyPath ofObject:(id)object change:(CPDictionary)change context:(id)context
@@ -5,7 +5,7 @@
@import <AppKit/CPCursor.j>

@implementation CursorTester : CPView
-{ 
+{
    CPCursor testCursor;
    CPTextField label;
 }
@@ -15,6 +15,7 @@
            cursor:(CPCursor)aCursor
 {
    self = [super init];
+
    if (self)
    {
        testCursor = aCursor;
@@ -26,7 +27,16 @@
                                  anOrigin.y,
                                  [label frame].size.width,
                                  [label frame].size.height)];
+
+      var trackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero()
+                                   options:CPTrackingMouseEnteredAndExited | CPTrackingActiveInKeyWindow | CPTrackingInVisibleRect
+                                     owner:self
+                                  userInfo:nil];
+
+      [self addTrackingArea:trackingArea];
+;
    }
+
    return self;
 }

@@ -57,7 +67,7 @@
    	yInc = 25,
        imageCursorTester = [[CursorTester alloc] initWithText:@"Image cursor"
                                                        origin:CGPointMake(x, y)
-                                                        cursor:[[CPCursor alloc] initWithImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle mainBundle] resourcePath] + @"spinner.gif"] 
+                                                        cursor:[[CPCursor alloc] initWithImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle mainBundle] resourcePath] + @"spinner.gif"]
                                                                                       hotSpot:CGPointMakeZero()]],
        arrowCursorTester = [[CursorTester alloc] initWithText:@"Arrow cursor"
                                                        origin:CGPointMake(x, y+=yInc)
@@ -110,7 +120,7 @@
        disappearingItemCursorTester = [[CursorTester alloc] initWithText:@"Disappearing item cursor"
                                                        origin:CGPointMake(x, y+=yInc)
 													    cursor:[CPCursor disappearingItemCursor]];
-        
+
    [contentView addSubview:imageCursorTester];
    [contentView addSubview:arrowCursorTester];
    [contentView addSubview:crosshairCursorTester];
@@ -6,8 +6,7 @@
 * Copyright 2010, Your Company All rights reserved.
 */

-var categories = ["firstName", "lastName"],
-    MenuItemPrefix = @"   ";
+var categories = ["firstName", "lastName"];

@implementation AppController : CPObject
 {
@@ -40,18 +39,20 @@ var categories = ["firstName", "lastName"],
                              keyEquivalent:@""
                                    atIndex:0];

-    var item = [[CPMenuItem alloc] initWithTitle:MenuItemPrefix + @"First Name"
+    var item = [[CPMenuItem alloc] initWithTitle:@"First Name"
                                          action:@selector(changeCategory:)
                                   keyEquivalent:@""];
-
+    [item setIndentationLevel:1];
    [item setTarget:self];
    [item setTag:1];
    [item setState:CPOnState];
    [searchMenuTemplate insertItem:item atIndex:1];

-    item = [[CPMenuItem alloc] initWithTitle:MenuItemPrefix + @"Last Name"
+    item = [[CPMenuItem alloc] initWithTitle:@"Last Name"
                                      action:@selector(changeCategory:)
                                keyEquivalent:@""];
+
+    [item setIndentationLevel:1];
    [item setTarget:self];
    [item setTag:2];
    [item setState:CPOffState];
@@ -104,7 +105,7 @@ var categories = ["firstName", "lastName"],
 - (void)changeCategory:(CPMenuItem)menuItem
 {
    searchCategoryIndex = [menuItem tag] - 1;
-    [searchField setPlaceholderString:[[menuItem title] substringFromIndex:[MenuItemPrefix length]]];
+    [searchField setPlaceholderString:[menuItem title]];

    [self _updateSearchMenuTemplate];
 }
@@ -0,0 +1,99 @@
+/*
+ * AppController.j
+ * CPViewController
+ *
+ * Created by You on November 11, 2015.
+ * Copyright 2015, Your Company All rights reserved.
+ */
+
+@import <Foundation/Foundation.j>
+@import <AppKit/AppKit.j>
+
+@implementation Button : CPButton
+{
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    [[CPApp delegate] load];
+    [super mouseDown:anEvent];
+}
+
+- (void)mouseUp:(CPEvent)anEvent
+{
+    [[CPApp delegate] removeSubviews];
+    [super mouseUp:anEvent];
+}
+
+@end
+
+@implementation AppController : CPObject
+{
+    @outlet CPWindow    theWindow;
+    @outlet CPView holderView;
+
+    BOOL async @accessors;
+}
+
+- (void)applicationDidFinishLaunching:(CPNotification)aNotification
+{
+    // This is called when the application is done loading.
+}
+
+- (void)awakeFromCib
+{
+    // This is called when the cib is done loading.
+    // You can implement this method on any object instantiated from a Cib.
+    // It's a useful hook for setting up current UI values, and other things.
+
+    // In this case, we want the window from Cib to become our full browser window
+    [theWindow setFullPlatformWindow:NO];
+
+}
+
+- (void)load
+{
+    if (async)
+        [self loadAsync];
+    else
+        [self loadSync];
+}
+
+- (void)loadAsync
+{
+    var vc = [[CPViewController alloc] initWithCibName:@"ViewController" bundle:nil];
+    var vc2 = [[CPViewController alloc] initWithCibName:@"ViewController2" bundle:nil];
+
+    [vc loadViewWithCompletionHandler:function(view1, error)
+    {
+        [view1 setBackgroundColor:[CPColor redColor]];
+        [holderView addSubview:view1];
+
+        [vc2 loadViewWithCompletionHandler:function(view2, error)
+        {
+            [view2 setBackgroundColor:[CPColor greenColor]];
+            [view1 addSubview:view2];
+        }];
+    }];
+}
+
+- (void)loadSync
+{
+    var vc = [[CPViewController alloc] initWithCibName:@"ViewController" bundle:nil];
+    var vc2 = [[CPViewController alloc] initWithCibName:@"ViewController2" bundle:nil];
+
+    var view1 = [vc view];
+    [view1 setBackgroundColor:[CPColor redColor]];
+    [holderView addSubview:view1];
+
+    var view2 = [vc2 view];
+    [view2 setBackgroundColor:[CPColor greenColor]];
+    [view1 addSubview:view2];
+}
+
+- (@action)removeSubviews:(id)sender
+{
+    [[holderView subviews] makeObjectsPerformSelector:@selector(removeFromSuperview)];
+}
+
+@end
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Main cib file base name</key>
+	<string>MainMenu.cib</string>
+	<key>CPBundleName</key>
+	<string>CPViewController</string>
+    <key>CPBundleVersion</key>
+    <string>1.0</string>
+    <key>CPHumanReadableCopyright</key>
+    <string>Copyright © 2015, Your Company All rights reserved.</string>
+</dict>
+</plist>
@@ -0,0 +1,184 @@
+/*
+ * Jakefile
+ * CPViewController
+ *
+ * Created by You on November 11, 2015.
+ * Copyright 2015, Your Company All rights reserved.
+ */
+
+var ENV = require("system").env,
+    FILE = require("file"),
+    JAKE = require("jake"),
+    task = JAKE.task,
+    FileList = JAKE.FileList,
+    app = require("cappuccino/jake").app,
+    configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug",
+    OS = require("os"),
+    projectName = "CPViewController";
+
+app (projectName, function(task)
+{
+    ENV["OBJJ_INCLUDE_PATHS"] = "Frameworks";
+
+    if (configuration === "Debug")
+        ENV["OBJJ_INCLUDE_PATHS"] = FILE.join(ENV["OBJJ_INCLUDE_PATHS"], configuration);
+
+    task.setBuildIntermediatesPath(FILE.join("Build", "CPViewController.build", configuration));
+    task.setBuildPath(FILE.join("Build", configuration));
+
+    task.setProductName("CPViewController");
+    task.setIdentifier("com.yourcompany.CPViewController");
+    task.setVersion("1.0");
+    task.setAuthor("Your Company");
+    task.setEmail("feedback @nospam@ yourcompany.com");
+    task.setSummary("CPViewController");
+    task.setSources(new FileList("**/*.j").exclude(FILE.join("Build", "**")).exclude(FILE.join("Frameworks", "Source", "**")));
+    task.setResources(new FileList("Resources/**"));
+    task.setIndexFilePath("index.html");
+    task.setInfoPlistPath("Info.plist");
+
+    if (configuration === "Debug")
+        task.setCompilerFlags("-DDEBUG -g");
+    else
+        task.setCompilerFlags("-O2");
+});
+
+task ("default", [projectName], function()
+{
+    printResults(configuration);
+});
+
+task ("build", ["default"], function()
+{
+    updateApplicationSize();
+});
+
+task ("debug", function()
+{
+    configuration = ENV["CONFIGURATION"] = "Debug";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("release", function()
+{
+    configuration = ENV["CONFIGURATION"] = "Release";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("run", ["debug"], function()
+{
+    OS.system(["open", FILE.join("Build", "Debug", projectName, "index.html")]);
+});
+
+task ("run-release", ["release"], function()
+{
+    OS.system(["open", FILE.join("Build", "Release", projectName, "index.html")]);
+});
+
+task ("deploy", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Deployment", projectName));
+    OS.system(["press", "-f", FILE.join("Build", "Release", projectName), FILE.join("Build", "Deployment", projectName)]);
+    printResults("Deployment")
+});
+
+task ("desktop", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Desktop", projectName));
+    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", projectName), FILE.join("Build", "Desktop", projectName, "CPViewController.app"));
+    printResults("Desktop")
+});
+
+task ("run-desktop", ["desktop"], function()
+{
+    OS.system([FILE.join("Build", "Desktop", projectName, "CPViewController.app", "Contents", "MacOS", "NativeHost"), "-i"]);
+});
+
+function printResults(configuration)
+{
+    print("----------------------------");
+    print(configuration+" app built at path: "+FILE.join("Build", configuration, projectName));
+    print("----------------------------");
+}
+
+function updateApplicationSize()
+{
+    print("Calculating application file sizes...");
+
+    var contents = FILE.read(FILE.join("Build", configuration, projectName, "Info.plist"), { charset:"UTF-8" }),
+        format = CFPropertyList.sniffedFormatOfString(contents),
+        plist = CFPropertyList.propertyListFromString(contents),
+        totalBytes = {executable:0, data:0, mhtml:0};
+
+    // Get the size of all framework executables and sprite data
+    var frameworksDir = "Frameworks";
+
+    if (configuration === "Debug")
+        frameworksDir = FILE.join(frameworksDir, "Debug");
+
+    var frameworks = FILE.list(frameworksDir);
+
+    frameworks.forEach(function(framework)
+    {
+        if (framework !== "Source")
+            addBundleFileSizes(FILE.join(frameworksDir, framework), totalBytes);
+    });
+
+    // Read in the default theme name, and attempt to get its size
+    var themeName = plist.valueForKey("CPDefaultTheme") || "Aristo2",
+        themePath = nil;
+
+    if (themeName === "Aristo" || themeName === "Aristo2")
+        themePath = FILE.join(frameworksDir, "AppKit", "Resources", themeName + ".blend");
+    else
+        themePath = FILE.join("Frameworks", "Resources", themeName + ".blend");
+
+    if (FILE.isDirectory(themePath))
+        addBundleFileSizes(themePath, totalBytes);
+
+    // Add sizes for the app
+    addBundleFileSizes(FILE.join("Build", configuration, projectName), totalBytes);
+
+    print("Executables: " + totalBytes.executable + ", sprite data: " + totalBytes.data + ", total: " + (totalBytes.executable + totalBytes.data));
+
+    var dict = new CFMutableDictionary();
+
+    dict.setValueForKey("executable", totalBytes.executable);
+    dict.setValueForKey("data", totalBytes.data);
+    dict.setValueForKey("mhtml", totalBytes.mhtml);
+
+    plist.setValueForKey("CPApplicationSize", dict);
+
+    FILE.write(FILE.join("Build", configuration, projectName, "Info.plist"), CFPropertyList.stringFromPropertyList(plist, format), { charset:"UTF-8" });
+}
+
+function addBundleFileSizes(bundlePath, totalBytes)
+{
+    var bundleName = FILE.basename(bundlePath),
+        environment = bundleName === "Foundation" ? "Objj" : "Browser",
+        bundlePath = FILE.join(bundlePath, environment + ".environment");
+
+    if (FILE.isDirectory(bundlePath))
+    {
+        var filename = bundleName + ".sj",
+            filePath = new FILE.Path(FILE.join(bundlePath, filename));
+
+        if (filePath.exists())
+            totalBytes.executable += filePath.size();
+
+        filePath = new FILE.Path(FILE.join(bundlePath, "dataURLs.txt"));
+
+        if (filePath.exists())
+            totalBytes.data += filePath.size();
+
+        filePath = new FILE.Path(FILE.join(bundlePath, "MHTMLData.txt"));
+
+        if (filePath.exists())
+            totalBytes.mhtml += filePath.size();
+
+        filePath = new FILE.Path(FILE.join(bundlePath, "MHTMLPaths.txt"));
+
+        if (filePath.exists())
+            totalBytes.mhtml += filePath.size();
+    }
+}
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9060" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment version="1050" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9060"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
+            <connections>
+                <outlet property="delegate" destination="450" id="451"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="335" y="390" width="480" height="360"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
+            <view key="contentView" id="372">
+                <rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <customView id="w9e-Zb-daF">
+                        <rect key="frame" x="44" y="20" width="390" height="243"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    </customView>
+                    <button verticalHuggingPriority="750" id="gT9-6e-KoE" customClass="Button">
+                        <rect key="frame" x="38" y="321" width="169" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="push" title="Load View Controller" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="XTP-0T-Mew">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                    </button>
+                    <button id="4bJ-Ys-LRV">
+                        <rect key="frame" x="211" y="329" width="122" height="18"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="check" title="Asynchronously" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="ecG-wc-Zbu">
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <binding destination="450" name="value" keyPath="async" id="KZD-w9-lYJ"/>
+                        </connections>
+                    </button>
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="3Dg-Pi-Ek1">
+                        <rect key="frame" x="42" y="271" width="394" height="36"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="After loading the view controller, you should see a green rectangle inside a red rectangle." id="13V-4j-MGL">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <button verticalHuggingPriority="750" id="JDH-Sz-h6Z">
+                        <rect key="frame" x="375" y="321" width="91" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="push" title="Remove" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="INI-Ui-HdW">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="removeSubviews:" target="450" id="emQ-aC-AH0"/>
+                        </connections>
+                    </button>
+                </subviews>
+            </view>
+        </window>
+        <customObject id="450" customClass="AppController">
+            <connections>
+                <outlet property="holderView" destination="w9e-Zb-daF" id="ZG8-xB-3Z1"/>
+                <outlet property="theWindow" destination="371" id="459"/>
+            </connections>
+        </customObject>
+    </objects>
+</document>
@@ -0,0 +1 @@
+280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;18E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;11E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;10;$classnameS;18;_CPCibCustomObjectK;8;$classesA;S;18;_CPCibCustomObjectS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;19E;E;D;K;10;$classnameS;5;CPSetK;8;$classesA;S;5;CPSetS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;12E;K;15;CPSetObjectsKeyD;K;6;CP$UIDd;2;20E;E;D;K;10;$classnameS;20;CPCibOutletConnectorK;8;$classesA;S;20;CPCibOutletConnectorS;14;CPCibConnectorS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;11E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;18E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;21E;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;22E;E;D;K;10;$classnameS;18;_CPCibClassSwapperK;8;$classesA;S;18;_CPCibClassSwapperS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;17E;K;18;CPResponderMenuKeyD;K;6;CP$UIDd;1;0E;K;12;CPViewTagKeyD;K;6;CP$UIDd;2;23E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;2;24E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;2;24E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;2;25E;K;19;CPViewThemeClassKeyD;K;6;CP$UIDd;1;0E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;2;26E;K;14;CPViewScaleKeyD;K;6;CP$UIDd;2;27E;K;18;CPViewSizeScaleKeyD;K;6;CP$UIDd;2;27E;K;17;CPViewIsScaledKeyD;K;6;CP$UIDd;2;28E;K;19;CPViewAppearanceKeyD;K;6;CP$UIDd;1;0E;K;32;CPDoNotTranslateAutoresizingMaskD;K;6;CP$UIDd;2;28E;K;30;_CPCibClassSwapperClassNameKeyD;K;6;CP$UIDd;2;29E;K;38;_CPCibClassSwapperOriginalClassNameKeyD;K;6;CP$UIDd;2;30E;E;S;16;CPViewControllerD;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;S;4;viewS;13;CPApplicationd;1;0S;20;{{0, 0}, {480, 272}}d;2;12S;6;normalS;6;{1, 1}F;S;6;NSViewS;6;CPViewE;K;9;$archiverS;15;CPKeyedArchiverK;8;$versionS;6;100000E;
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9060" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9060"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSViewController">
+            <connections>
+                <outlet property="view" destination="c22-O7-iKe" id="2OW-O2-sHh"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="c22-O7-iKe">
+            <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+        </customView>
+    </objects>
+</document>
@@ -0,0 +1 @@
+280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;18E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;11E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;10;$classnameS;18;_CPCibCustomObjectK;8;$classesA;S;18;_CPCibCustomObjectS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;19E;E;D;K;10;$classnameS;5;CPSetK;8;$classesA;S;5;CPSetS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;12E;K;15;CPSetObjectsKeyD;K;6;CP$UIDd;2;20E;E;D;K;10;$classnameS;20;CPCibOutletConnectorK;8;$classesA;S;20;CPCibOutletConnectorS;14;CPCibConnectorS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;11E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;18E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;21E;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;22E;E;D;K;10;$classnameS;18;_CPCibClassSwapperK;8;$classesA;S;18;_CPCibClassSwapperS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;17E;K;18;CPResponderMenuKeyD;K;6;CP$UIDd;1;0E;K;12;CPViewTagKeyD;K;6;CP$UIDd;2;23E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;2;24E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;2;24E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;2;25E;K;19;CPViewThemeClassKeyD;K;6;CP$UIDd;1;0E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;2;26E;K;14;CPViewScaleKeyD;K;6;CP$UIDd;2;27E;K;18;CPViewSizeScaleKeyD;K;6;CP$UIDd;2;27E;K;17;CPViewIsScaledKeyD;K;6;CP$UIDd;2;28E;K;19;CPViewAppearanceKeyD;K;6;CP$UIDd;1;0E;K;32;CPDoNotTranslateAutoresizingMaskD;K;6;CP$UIDd;2;28E;K;30;_CPCibClassSwapperClassNameKeyD;K;6;CP$UIDd;2;29E;K;38;_CPCibClassSwapperOriginalClassNameKeyD;K;6;CP$UIDd;2;30E;E;S;16;CPViewControllerD;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;S;4;viewS;13;CPApplicationd;1;0S;20;{{0, 0}, {268, 165}}d;2;12S;6;normalS;6;{1, 1}F;S;6;NSViewS;6;CPViewE;K;9;$archiverS;15;CPKeyedArchiverK;8;$versionS;6;100000E;
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9060" systemVersion="14F27" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9060"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSViewController">
+            <connections>
+                <outlet property="view" destination="c22-O7-iKe" id="2OW-O2-sHh"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="c22-O7-iKe">
+            <rect key="frame" x="0.0" y="0.0" width="268" height="165"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <point key="canvasLocation" x="307" y="363.5"/>
+        </customView>
+    </objects>
+</document>
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1070</int>
-		<string key="IBDocument.SystemVersion">11C42</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1138.17</string>
-		<string key="IBDocument.HIToolboxVersion">567.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1938</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSWindowTemplate</string>
-			<string>NSView</string>
-			<string>NSCustomObject</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="NSCustomObject" id="1001">
-				<string key="NSClassName">NSObject</string>
-			</object>
-			<object class="NSCustomObject" id="1003">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1004">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSWindowTemplate" id="1005">
-				<int key="NSWindowStyleMask">15</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{196, 240}, {480, 270}}</string>
-				<int key="NSWTFlags">544735232</int>
-				<string key="NSWindowTitle">Window</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<object class="NSView" key="NSWindowView" id="1006">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<string key="NSFrameSize">{480, 270}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords"/>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1001"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1003"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1004"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="1005"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="1006"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2</int>
-						<reference key="object" ref="1006"/>
-						<reference key="parent" ref="1005"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1.IBWindowTemplateEditedContentRect">{{357, 418}, {480, 270}}</string>
-				<integer value="1" key="1.NSWindowTemplate.visibleAtLaunch"/>
-				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">2</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<bool key="IBDocument.UseAutolayout">YES</bool>
-	</data>
-</archive>
@@ -0,0 +1,193 @@
+<!DOCTYPE html>
+<html lang="en">
+<!--
+ index-debug.html
+ CPViewController
+
+ Created by You on November 11, 2015.
+ Copyright 2015, Your Company All rights reserved.
+-->
+    <head>
+        <meta charset="utf-8">
+
+        <!--[if lte IE 8]>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1">
+        <![endif]-->
+        <!--[if gte IE 9]>
+        <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
+        <![endif]-->
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
+
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <meta name="apple-mobile-web-app-status-bar-style" content="black">
+
+        <link rel="apple-touch-icon" href="Resources/icon.png">
+        <link rel="apple-touch-startup-image" href="Resources/default.png">
+
+        <title>CPViewController</title>
+
+        <!-- Custom javascript goes here -->
+        <!-- End custom javascript -->
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks"];
+            // Uncomment below to generate debug symbols, type signatures and inline objj_msgSend functions
+            // OBJJ_COMPILER_FLAGS = ["IncludeDebugSymbols", "IncludeTypeSignatures", "InlineMsgSend"];
+
+            var progressBar = null;
+
+            OBJJ_PROGRESS_CALLBACK = function(percent, appSize, path)
+            {
+                percent = percent * 100;
+
+                if (!progressBar)
+                    progressBar = document.getElementById("progress-bar");
+
+                if (progressBar)
+                    progressBar.style.width = Math.min(percent, 100) + "%";
+            }
+
+            var loadingHTML =
+                    '<div id="loading">' +
+                    '    <div id="loading-text">Loading...</div>' +
+                    '    <div id="progress-indicator">' +
+                    '        <span id="progress-bar" style="width:0%"></span>' +
+                    '    </div>' +
+                    '</div>';
+        </script>
+
+        <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <script type="text/javascript">
+            objj_msgSend_reset();
+
+            // DEBUG OPTIONS:
+
+            // Uncomment to enable printing of backtraces on exceptions:
+            //objj_msgSend_decorate(objj_backtrace_decorator);
+
+            // Uncomment to supress exceptions that take place inside a message
+            //objj_msgSend_decorate(objj_supress_exceptions_decorator)
+
+            // Uncomment to enable runtime type checking:
+            //objj_msgSend_decorate(objj_typecheck_decorator);
+
+            // Uncomment (along with both above) to print backtraces on type check errors:
+            //objj_typecheck_prints_backtrace = true;
+
+            // Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise):
+            //CPLogUnregister(CPLogDefault);
+
+            // Uncomment to enable a specific logger:
+            //CPLogRegister(CPLogConsole);
+            //CPLogRegister(CPLogPopup);
+
+            // Tag view DOM elements with a "data-cappuccino-view" attribute that contains
+            // the class name of the view that created them. Comment this or set to false to disable.
+            appkit_tag_dom_elements = true;
+        </script>
+
+        <style type="text/css">
+            html, body, h1, p {
+                margin: 0;
+                padding: 0;
+            }
+
+            /* We need a body wrapper because Cappuccino is unhappy if we change the body element */
+            #cappuccino-body {
+                /* Position it absolutely so it will fill the height without content */
+                position: absolute;
+                top: 0;
+                bottom: 0;
+                width: 100%;
+
+                /* Put it at the bottom of the stack so it doesn't interfere with UI */
+                z-index: 0;
+            }
+
+            #cappuccino-body .container {
+                display: table;
+                margin: 0 auto;
+                height: 100%;
+            }
+
+            #cappuccino-body .content {
+                display: table-cell;
+                height: 100%;
+                vertical-align: top;
+            }
+
+            #loading {
+                position: relative;
+                top: 35%;
+            }
+
+            #loading-text {
+                height: 1.5em;
+                color: #555;
+                font: normal bold 36px/36px Arial, sans-serif;
+            }
+
+            #progress-indicator {
+                padding: 0px;
+                height: 16px;
+                border: 5px solid #555;
+                border-radius: 18px;
+                background-color: white;
+            }
+
+            #progress-bar {
+                position: relative;
+                top: -1px;
+                left: -1px;
+                display: block;
+                height: 18px;
+
+                /* Compensate for moving the bar left 1px to overlap the indicator border */
+                border-right: 1px solid #555;
+                background-color: #555;
+            }
+
+            #noscript {
+                position: relative;
+                top: 35%;
+                padding: 1em 1.5em;
+                border: 5px solid #555;
+                border-radius: 16px;
+                background-color: white;
+                color: #555;
+                text-align: center;
+                font: bold 24px Arial, sans-serif;
+            }
+
+            #noscript a {
+                color: #98c0ff;
+                text-decoration: none;
+            }
+        </style>
+    </head>
+
+    <body>
+        <div id="cappuccino-body">
+            <div class="container">
+                <div class="content">
+                    <script type="text/javascript">
+                        document.write(loadingHTML);
+                    </script>
+                </div>
+            </div>
+            <noscript style="position:absolute; top:0; left:0; width:100%; height:100%">
+                <div class="container">
+                    <div class="content">
+                        <div id="noscript">
+                            <p style="font-size:120%; margin-bottom:.75em">JavaScript is required for this site.</p>
+                            <p><a href="http://www.enable-javascript.com" target="_blank">Enable JavaScript</a></p>
+                        </div>
+                    </div>
+                </div>
+            </noscript>
+        </div>
+    </body>
+</html>
@@ -0,0 +1,161 @@
+<!DOCTYPE html>
+<html lang="en">
+<!--
+ index.html
+ CPViewController
+
+ Created by You on November 11, 2015.
+ Copyright 2015, Your Company All rights reserved.
+-->
+    <head>
+        <meta charset="utf-8">
+
+        <!--[if lte IE 8]>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1">
+        <![endif]-->
+        <!--[if gte IE 9]>
+        <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
+        <![endif]-->
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
+
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <meta name="apple-mobile-web-app-status-bar-style" content="black">
+
+        <link rel="apple-touch-icon" href="Resources/icon.png">
+        <link rel="apple-touch-startup-image" href="Resources/default.png">
+
+        <title>CPViewController</title>
+
+        <!-- Custom javascript goes here -->
+        <!-- End custom javascript -->
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+
+            var progressBar = null;
+
+            OBJJ_PROGRESS_CALLBACK = function(percent, appSize, path)
+            {
+                percent = percent * 100;
+
+                if (!progressBar)
+                    progressBar = document.getElementById("progress-bar");
+
+                if (progressBar)
+                    progressBar.style.width = Math.min(percent, 100) + "%";
+            }
+
+            var loadingHTML =
+                    '<div id="loading">' +
+                    '    <div id="loading-text">Loading...</div>' +
+                    '    <div id="progress-indicator">' +
+                    '        <span id="progress-bar" style="width:0%"></span>' +
+                    '    </div>' +
+                    '</div>';
+        </script>
+
+        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <style type="text/css">
+            html, body, h1, p {
+                margin: 0;
+                padding: 0;
+            }
+
+            /* We need a body wrapper because Cappuccino is unhappy if we change the body element */
+            #cappuccino-body {
+                /* Position it absolutely so it will fill the height without content */
+                position: absolute;
+                top: 0;
+                bottom: 0;
+                width: 100%;
+
+                /* Put it at the bottom of the stack so it doesn't interfere with UI */
+                z-index: 0;
+            }
+
+            #cappuccino-body .container {
+                display: table;
+                margin: 0 auto;
+                height: 100%;
+            }
+
+            #cappuccino-body .content {
+                display: table-cell;
+                height: 100%;
+                vertical-align: top;
+            }
+
+            #loading {
+                position: relative;
+                top: 35%;
+            }
+
+            #loading-text {
+                height: 1.5em;
+                color: #555;
+                font: normal bold 36px/36px Arial, sans-serif;
+            }
+
+            #progress-indicator {
+                padding: 0px;
+                height: 16px;
+                border: 5px solid #555;
+                border-radius: 18px;
+                background-color: white;
+            }
+
+            #progress-bar {
+                position: relative;
+                top: -1px;
+                left: -1px;
+                display: block;
+                height: 18px;
+
+                /* Compensate for moving the bar left 1px to overlap the indicator border */
+                border-right: 1px solid #555;
+                background-color: #555;
+            }
+
+            #noscript {
+                position: relative;
+                top: 35%;
+                padding: 1em 1.5em;
+                border: 5px solid #555;
+                border-radius: 16px;
+                background-color: white;
+                color: #555;
+                text-align: center;
+                font: bold 24px Arial, sans-serif;
+            }
+
+            #noscript a {
+                color: #98c0ff;
+                text-decoration: none;
+            }
+        </style>
+    </head>
+
+    <body>
+        <div id="cappuccino-body">
+            <div class="container">
+                <div class="content">
+                    <script type="text/javascript">
+                        document.write(loadingHTML);
+                    </script>
+                </div>
+            </div>
+            <noscript style="position:absolute; top:0; left:0; width:100%; height:100%">
+                <div class="container">
+                    <div class="content">
+                        <div id="noscript">
+                            <p style="font-size:120%; margin-bottom:.75em">JavaScript is required for this site.</p>
+                            <p><a href="http://www.enable-javascript.com" target="_blank">Enable JavaScript</a></p>
+                        </div>
+                    </div>
+                </div>
+            </noscript>
+        </div>
+    </body>
+</html>
@@ -1,9 +1,9 @@
 /*
 * AppController.j
- * CPViewNoDisplayAfterHidingAndResizeBug
+ * CPViewController
 *
- * Created by You on February 24, 2013.
- * Copyright 2013, Your Company All rights reserved.
+ * Created by You on November 11, 2015.
+ * Copyright 2015, Your Company All rights reserved.
 */

@import <Foundation/Foundation.j>
@@ -1,63 +0,0 @@
-/*
- * AppController.j
- * CPViewNoDisplayAfterHidingAndResizeBug
- *
- * Created by You on February 24, 2013.
- * Copyright 2013, Your Company All rights reserved.
- */
-
-@import <Foundation/CPObject.j>
-
-
-@implementation AppController : CPObject
-{
-    CPView view;
-}
-
- (void)applicationDidFinishLaunching:(CPNotification)aNotification
-{
-    var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(100,100,700,400) styleMask:CPResizableWindowMask],
-        contentView = [theWindow contentView];
-
-    var button = [[CPButton alloc] initWithFrame:CGRectMake(10, 10, 200, 28)];
-    [button setTitle:@"Hide"];
-    [button setAlternateTitle:@"Unhide"];
-    [button setButtonType:CPToggleButton];
-    [button setTarget:self];
-    [button setAction:@selector(hide:)];
-
-    var textField = [[CPTextField alloc] initWithFrame:CGRectMake(230, 10, 500, 50)];
-    [textField setStringValue:@"Test: 1/ Hide the red view, 2/ resize the window (and the red view), 3/ unhide the view.\n Expected: the red view should be visible and resized."];
-
-    view = [[CustomView alloc] initWithFrame:CGRectMake(100,100, 200,200)];
-    [view setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-    [contentView addSubview:button];
-    [contentView addSubview:textField];
-    [contentView addSubview:view];
-
-    [theWindow orderFront:self];
-}
-
- (void)hide:(id)sender
-{
-    var state = [sender state];
-    [view setHidden:(state == CPOnState)];
-}
-
-@end
-
-@implementation CustomView : CPView
-{
-}
-
- (void)drawRect:(CGRect)aRect
-{
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
-
-    [[CPColor redColor] set];
-
-    CGContextFillRect(ctx, [self bounds]);
-}
-
-@end
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CPApplicationDelegateClass</key>
-	<string>AppController</string>
-	<key>CPBundleName</key>
-	<string>CPViewNoDisplayAfterHidingAndResizeBug</string>
-	<key>CPPrincipalClass</key>
-	<string>CPApplication</string>
-</dict>
-</plist>
@@ -1,93 +0,0 @@
-/*
- * Jakefile
- * CPViewNoDisplayAfterHidingAndResizeBug
- *
- * Created by You on February 24, 2013.
- * Copyright 2013, Your Company All rights reserved.
- */
-
-var ENV = require("system").env,
-    FILE = require("file"),
-    JAKE = require("jake"),
-    task = JAKE.task,
-    FileList = JAKE.FileList,
-    app = require("cappuccino/jake").app,
-    configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug",
-    OS = require("os");
-
-app ("CPViewNoDisplayAfterHidingAndResizeBug", function(task)
-{
-    task.setBuildIntermediatesPath(FILE.join("Build", "CPViewNoDisplayAfterHidingAndResizeBug.build", configuration));
-    task.setBuildPath(FILE.join("Build", configuration));
-
-    task.setProductName("CPViewNoDisplayAfterHidingAndResizeBug");
-    task.setIdentifier("com.yourcompany.CPViewNoDisplayAfterHidingAndResizeBug");
-    task.setVersion("1.0");
-    task.setAuthor("Your Company");
-    task.setEmail("feedback @nospam@ yourcompany.com");
-    task.setSummary("CPViewNoDisplayAfterHidingAndResizeBug");
-    task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
-    task.setResources(new FileList("Resources/**"));
-    task.setIndexFilePath("index.html");
-    task.setInfoPlistPath("Info.plist");
-
-    if (configuration === "Debug")
-        task.setCompilerFlags("-DDEBUG -g");
-    else
-        task.setCompilerFlags("-O");
-});
-
-task ("default", ["CPViewNoDisplayAfterHidingAndResizeBug"], function()
-{
-    printResults(configuration);
-});
-
-task ("build", ["default"]);
-
-task ("debug", function()
-{
-    ENV["CONFIGURATION"] = "Debug";
-    JAKE.subjake(["."], "build", ENV);
-});
-
-task ("release", function()
-{
-    ENV["CONFIGURATION"] = "Release";
-    JAKE.subjake(["."], "build", ENV);
-});
-
-task ("run", ["debug"], function()
-{
-    OS.system(["open", FILE.join("Build", "Debug", "CPViewNoDisplayAfterHidingAndResizeBug", "index.html")]);
-});
-
-task ("run-release", ["release"], function()
-{
-    OS.system(["open", FILE.join("Build", "Release", "CPViewNoDisplayAfterHidingAndResizeBug", "index.html")]);
-});
-
-task ("deploy", ["release"], function()
-{
-    FILE.mkdirs(FILE.join("Build", "Deployment", "CPViewNoDisplayAfterHidingAndResizeBug"));
-    OS.system(["press", "-f", FILE.join("Build", "Release", "CPViewNoDisplayAfterHidingAndResizeBug"), FILE.join("Build", "Deployment", "CPViewNoDisplayAfterHidingAndResizeBug")]);
-    printResults("Deployment")
-});
-
-task ("desktop", ["release"], function()
-{
-    FILE.mkdirs(FILE.join("Build", "Desktop", "CPViewNoDisplayAfterHidingAndResizeBug"));
-    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "CPViewNoDisplayAfterHidingAndResizeBug"), FILE.join("Build", "Desktop", "CPViewNoDisplayAfterHidingAndResizeBug", "CPViewNoDisplayAfterHidingAndResizeBug.app"));
-    printResults("Desktop")
-});
-
-task ("run-desktop", ["desktop"], function()
-{
-    OS.system([FILE.join("Build", "Desktop", "CPViewNoDisplayAfterHidingAndResizeBug", "CPViewNoDisplayAfterHidingAndResizeBug.app", "Contents", "MacOS", "NativeHost"), "-i"]);
-});
-
-function printResults(configuration)
-{
-    print("----------------------------");
-    print(configuration+" app built at path: "+FILE.join("Build", configuration, "CPViewNoDisplayAfterHidingAndResizeBug"));
-    print("----------------------------");
-}
@@ -1,112 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<!--
- index-debug.html
- CPViewNoDisplayAfterHidingAndResizeBug
-
- Created by You on February 24, 2013.
- Copyright 2013, Your Company All rights reserved.
-->
-    <head>
-        <meta charset="utf-8">
-
-        <!--[if lte IE 8]>
-        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1">
-        <![endif]-->
-        <!--[if gte IE 9]>
-        <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
-        <![endif]-->
-
-        <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
-
-        <meta name="apple-mobile-web-app-capable" content="yes">
-        <meta name="apple-mobile-web-app-status-bar-style" content="black">
-
-        <link rel="apple-touch-icon" href="Resources/icon.png">
-        <link rel="apple-touch-startup-image" href="Resources/default.png">
-
-        <title>CPViewNoDisplayAfterHidingAndResizeBug</title>
-
-        <script type="text/javascript">
-            OBJJ_MAIN_FILE = "main.j";
-            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks"];
-        </script>
-
-        <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-
-        <script type="text/javascript">
-            objj_msgSend_reset();
-
-            // DEBUG OPTIONS:
-
-            // Uncomment to enable printing of backtraces on exceptions:
-            //objj_msgSend_decorate(objj_backtrace_decorator);
-
-            // Uncomment to supress exceptions that take place inside a message
-            //objj_msgSend_decorate(objj_supress_exceptions_decorator)
-
-            // Uncomment to enable runtime type checking:
-            //objj_msgSend_decorate(objj_typecheck_decorator);
-
-            // Uncomment (along with both above) to print backtraces on type check errors:
-            //objj_typecheck_prints_backtrace = true;
-
-            // Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise):
-            //CPLogUnregister(CPLogDefault);
-
-            // Uncomment to enable a specific logger:
-            //CPLogRegister(CPLogConsole);
-            //CPLogRegister(CPLogPopup);
-
-            // Tag view DOM elements with a "data-cappuccino-view" attribute that contains
-            // the class name of the view that created them. Comment this or set to false to disable.
-            appkit_tag_dom_elements = true;
-        </script>
-
-        <style type="text/css">
-            body{margin:0; padding:0;}
-            #container {position: absolute; top:50%; left:50%;}
-            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
-            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
-            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
-        </style>
-
-        <!--[if lt IE 7]>
-        <STYLE type="text/css">
-            #container { position: relative; top: 50%; }
-            #content { position: relative;}
-        </STYLE>
-        <![endif]-->
-
-    </head>
-
-    <body style="">
-        <div id="cappuccino-body">
-            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type="text/javascript">
-                    document.write("<div id='container'><p id='content'>" +
-                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
-                                   "Loading CPViewNoDisplayAfterHidingAndResizeBug...</p></div>");
-                </script>
-
-                <noscript>
-                    <div id="container">
-                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
-                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
-                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
-                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
-                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
-                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
-                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
-                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
-                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </noscript>
-            </div>
-        </div>
-    </body>
-
-</html>
@@ -1,83 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<!--
- index.html
- CPViewNoDisplayAfterHidingAndResizeBug
-
- Created by You on February 24, 2013.
- Copyright 2013, Your Company All rights reserved.
-->
-    <head>
-        <meta charset="utf-8">
-
-        <!--[if lte IE 8]>
-        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1">
-        <![endif]-->
-        <!--[if gte IE 9]>
-        <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
-        <![endif]-->
-
-        <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
-
-        <meta name="apple-mobile-web-app-capable" content="yes">
-        <meta name="apple-mobile-web-app-status-bar-style" content="black">
-
-        <link rel="apple-touch-icon" href="Resources/icon.png">
-        <link rel="apple-touch-startup-image" href="Resources/default.png">
-
-        <title>CPViewNoDisplayAfterHidingAndResizeBug</title>
-
-        <script type="text/javascript">
-            OBJJ_MAIN_FILE = "main.j";
-        </script>
-
-        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
-
-        <style type="text/css">
-            body{margin:0; padding:0;}
-            #container {position: absolute; top:50%; left:50%;}
-            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
-            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
-            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
-        </style>
-
-        <!--[if lt IE 7]>
-        <STYLE type="text/css">
-            #container { position: relative; top: 50%; }
-            #content { position: relative;}
-        </STYLE>
-        <![endif]-->
-
-    </head>
-
-    <body style="">
-        <div id="cappuccino-body">
-            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
-                <script type="text/javascript">
-                    document.write("<div id='container'><p id='content'>" +
-                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
-                                   "Loading CPViewNoDisplayAfterHidingAndResizeBug...</p></div>");
-                </script>
-
-                <noscript>
-                    <div id="container">
-                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
-                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
-                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
-                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
-                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
-                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
-                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
-                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
-                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
-                            </ul>
-                        </div>
-                    </div>
-                </noscript>
-            </div>
-        </div>
-    </body>
-
-</html>
-
@@ -1 +1 @@
-280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;D;K;6;CP$UIDd;2;16E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;17E;D;K;6;CP$UIDd;2;19E;D;K;6;CP$UIDd;2;21E;D;K;6;CP$UIDd;2;22E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;19E;D;K;6;CP$UIDd;2;11E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;10;$classnameS;18;_CPCibCustomObjectK;8;$classesA;S;18;_CPCibCustomObjectS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;23E;E;D;K;10;$classnameS;5;CPSetK;8;$classesA;S;5;CPSetS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;12E;K;15;CPSetObjectsKeyD;K;6;CP$UIDd;2;24E;E;D;K;10;$classnameS;20;CPCibOutletConnectorK;8;$classesA;S;20;CPCibOutletConnectorS;14;CPCibConnectorS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;11E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;22E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;25E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;22E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;19E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;26E;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;23E;E;D;K;10;$classnameS;20;_CPCibWindowTemplateK;8;$classesA;S;20;_CPCibWindowTemplateS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;18E;K;30;_CPCibWindowTemplateMaxSizeKeyD;K;6;CP$UIDd;2;27E;K;32;_CPCibWindowTemplateViewClassKeyD;K;6;CP$UIDd;1;0E;K;34;_CPCibWindowTemplateWindowClassKeyD;K;6;CP$UIDd;2;28E;K;30;_CPCibWindowTemplateWTFlagsKeyD;K;6;CP$UIDd;2;29E;K;33;_CPCibWindowTemplateWindowRectKeyD;K;6;CP$UIDd;2;30E;K;33;_CPCibWindowTemplateScreenRectKeyD;K;6;CP$UIDd;2;31E;K;30;_CPCibWindowTempatStyleMaskKeyD;K;6;CP$UIDd;2;32E;K;34;_CPCibWindowTemplateWindowTitleKeyD;K;6;CP$UIDd;2;33E;K;33;_CPCibWindowTemplateWindowViewKeyD;K;6;CP$UIDd;2;21E;E;D;K;10;$classnameS;6;CPViewK;8;$classesA;S;6;CPViewS;11;CPResponderS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;20E;K;18;CPResponderMenuKeyD;K;6;CP$UIDd;1;0E;K;12;CPViewTagKeyD;K;6;CP$UIDd;2;34E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;2;35E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;2;35E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;2;36E;K;19;CPViewThemeClassKeyD;K;6;CP$UIDd;1;0E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;2;37E;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;38E;E;S;13;CPApplicationD;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;19E;E;E;S;8;delegateS;9;theWindowS;32;{10000000000000, 10000000000000}S;8;CPWindowd;10;1946157056S;23;{{408, 63}, {569, 418}}S;22;{{0, 0}, {1680, 1028}}d;1;7S;15;CPTheme Browserd;1;0S;20;{{0, 0}, {569, 418}}d;2;18S;6;normalS;13;AppControllerE;K;9;$archiverS;15;CPKeyedArchiverK;8;$versionS;6;100000E;
+280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;D;K;6;CP$UIDd;2;16E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;17E;D;K;6;CP$UIDd;2;19E;D;K;6;CP$UIDd;2;21E;D;K;6;CP$UIDd;2;22E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;19E;D;K;6;CP$UIDd;2;11E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;10;$classnameS;18;_CPCibCustomObjectK;8;$classesA;S;18;_CPCibCustomObjectS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;23E;E;D;K;10;$classnameS;5;CPSetK;8;$classesA;S;5;CPSetS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;12E;K;15;CPSetObjectsKeyD;K;6;CP$UIDd;2;24E;E;D;K;10;$classnameS;20;CPCibOutletConnectorK;8;$classesA;S;20;CPCibOutletConnectorS;14;CPCibConnectorS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;11E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;22E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;25E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;22E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;19E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;26E;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;23E;E;D;K;10;$classnameS;20;_CPCibWindowTemplateK;8;$classesA;S;20;_CPCibWindowTemplateS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;18E;K;30;_CPCibWindowTemplateMaxSizeKeyD;K;6;CP$UIDd;2;27E;K;32;_CPCibWindowTemplateViewClassKeyD;K;6;CP$UIDd;1;0E;K;34;_CPCibWindowTemplateWindowClassKeyD;K;6;CP$UIDd;2;28E;K;30;_CPCibWindowTemplateWTFlagsKeyD;K;6;CP$UIDd;2;29E;K;33;_CPCibWindowTemplateWindowRectKeyD;K;6;CP$UIDd;2;30E;K;33;_CPCibWindowTemplateScreenRectKeyD;K;6;CP$UIDd;2;31E;K;30;_CPCibWindowTempatStyleMaskKeyD;K;6;CP$UIDd;2;32E;K;34;_CPCibWindowTemplateWindowTitleKeyD;K;6;CP$UIDd;2;33E;K;33;_CPCibWindowTemplateWindowViewKeyD;K;6;CP$UIDd;2;21E;E;D;K;10;$classnameS;6;CPViewK;8;$classesA;S;6;CPViewS;11;CPResponderS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;20E;K;18;CPResponderMenuKeyD;K;6;CP$UIDd;1;0E;K;12;CPViewTagKeyD;K;6;CP$UIDd;2;34E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;2;35E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;2;35E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;2;36E;K;19;CPViewThemeClassKeyD;K;6;CP$UIDd;1;0E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;2;37E;K;14;CPViewScaleKeyD;K;6;CP$UIDd;2;38E;K;18;CPViewSizeScaleKeyD;K;6;CP$UIDd;2;38E;K;17;CPViewIsScaledKeyD;K;6;CP$UIDd;2;39E;K;19;CPViewAppearanceKeyD;K;6;CP$UIDd;1;0E;K;22;CPViewTrackingAreasKeyD;K;6;CP$UIDd;2;40E;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;41E;E;S;13;CPApplicationD;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;19E;E;E;S;8;delegateS;9;theWindowS;32;{10000000000000, 10000000000000}S;8;CPWindowd;10;1946157056S;23;{{408, 63}, {569, 418}}S;22;{{0, 0}, {1680, 1028}}d;1;7S;15;CPTheme Browserd;1;0S;20;{{0, 0}, {569, 418}}d;2;18S;6;normalS;6;{1, 1}F;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;S;13;AppControllerE;K;9;$archiverS;15;CPKeyedArchiverK;8;$versionS;6;100000E;
@@ -138,4 +138,26 @@
    [self setNeedsLayout];
 }

+- (CPView)createEphemeralSubviewNamed:(CPString)aName
+{
+    if (aName === "bezel-view")
+    {
+        var view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
+
+        [view setHitTests:NO];
+
+        return view;
+    }
+    else
+    {
+        var view = [[_CPImageAndTextView alloc] initWithFrame:CGRectMakeZero()];
+
+        [view setHitTests:NO];
+
+        return view;
+    }
+
+    return [super createEphemeralSubviewNamed:aName];
+}
+
@end
@@ -38,7 +38,7 @@ PROJECT_NAME           = " API"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.

-PROJECT_NUMBER         = 0.9.8
+PROJECT_NUMBER         = 0.9.9

 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -796,9 +796,9 @@
                        <rect key="frame" x="18" y="20" width="260" height="14"/>
                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                        <animations/>
-                        <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Copyright © 2012-2015 The Cappuccino Project" id="8lT-Ky-ecV">
+                        <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Copyright © 2012-2016 Cappuccino Project." id="8lT-Ky-ecV">
                            <font key="font" metaFont="smallSystem"/>
-                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="textColor" white="0.5" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                        </textFieldCell>
                    </textField>
@@ -46,7 +46,7 @@
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2015 cappuccino-project. All rights reserved.</string>
+	<string>Copyright © 2012-2016 Cappuccino Project. All rights reserved.</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
@@ -56,6 +56,6 @@
 	<key>XCCLastCappuccinoMasterBranchURL</key>
 	<string>https://github.com/cappuccino/cappuccino/archive/master.zip</string>
 	<key>XCCLastCappuccinoReleaseURL</key>
-	<string>https://github.com/cappuccino/cappuccino/archive/0.9.8.zip</string>
+	<string>https://github.com/cappuccino/cappuccino/archive/0.9.9.zip</string>
 </dict>
 </plist>
@@ -203,6 +203,7 @@ var NSButtonIsBorderedMask = 0x00800000,
    [self setImage:[cell normalImage]];
    [self setAlternateImage:alternateImage];
    [self setImagePosition:[cell imagePosition]];
+    [self setImageScaling:[cell imageScaling]];

    [self setEnabled:[cell isEnabled]];

@@ -417,8 +418,8 @@ var NSButtonIsBorderedMask = 0x00800000,
    CPImage     _alternateImage     @accessors(readonly, getter=alternateImage);

    BOOL        _allowsMixedState   @accessors(readonly, getter=allowsMixedState);
-    BOOL        _imagePosition      @accessors(readonly, getter=imagePosition);
-
+    int         _imagePosition      @accessors(readonly, getter=imagePosition);
+    int         _imageScaling       @accessors(readonly, getter=imageScaling);
    int         _highlightsBy       @accessors(readonly, getter=highlightsBy);
    int         _showsStateBy       @accessors(readonly, getter=showsStateBy);

@@ -439,6 +440,7 @@ var NSButtonIsBorderedMask = 0x00800000,

        _isBordered = (buttonFlags & NSButtonIsBorderedMask) ? YES : NO;
        _bezelStyle = (buttonFlags2 & 0x7) | ((buttonFlags2 & 0x20) >> 2);
+        _imageScaling = (((buttonFlags2 >> 6) & 0x3) + 2) % 4;

        // NSContents/NSAlternateContents for NSButton is actually the title/alternate title
        _title = [aCoder decodeObjectForKey:@"NSContents"];
@@ -43,6 +43,9 @@

        _isEditable = [aCoder decodeBoolForKey:@"NSEditable"];
        _automaticallyPreparesContent = [aCoder decodeBoolForKey:@"NSAutomaticallyPreparesContent"];
+        _usesLazyFetching = [aCoder decodeBoolForKey:@"_NSUsesLazyFetching"];
+        _isUsingManagedProxy = [aCoder decodeBoolForKey:@"_NSIsUsingManagedProxy"];
+        _managedProxy = [aCoder decodeObjectForKey:@"_NSManagedProxy"];
    }

    return self;
@@ -65,3 +68,37 @@
 }

@end
+
+
+@implementation _CPManagedProxy (NSCoding)
+
+- (id)NS_initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+
+    if (self)
+    {
+        _entityName = [aCoder decodeObjectForKey:@"NSEntityName"];
+        _fetchPredicate = [aCoder decodeObjectForKey:@"NSFetchPredicate"];
+    }
+
+    return self;
+}
+
+@end
+
+@implementation _NSManagedProxy : _CPManagedProxy
+{
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    return [self NS_initWithCoder:aCoder];
+}
+
+- (Class)classForKeyedArchiver
+{
+    return [_CPManagedProxy class];
+}
+
+@end
@@ -169,7 +169,7 @@ tmp_zip="/tmp/cappuccino.zip"
 local_distrib=""

 github_user="cappuccino"
-github_ref="v0.9.8"
+github_ref="v0.9.9"

 noprompt=""
 install_capp=""
@@ -1,3 +1,3 @@
 {
-    "version": "0.9.8"
+    "version": "0.9.9"
 }
Author	SHA1	Message	Date
Alexander Ljungberg	087e811586	Bump XcodeCapp copyright year.	2016-04-01 22:44:23 +01:00
Alexander Ljungberg	fa07bc143e	Fixed: missed some version number bumps in the 0.9.9 release.	2016-04-01 22:25:21 +01:00
Alexander Ljungberg	e13f5ed730	Fixed: CPNumber intValue did not return an integer. We expect this method to return a whole number like in Objective-C. This also goes for the related methods, `shortValue`, `longValue` and `longLongValue`. Also adds more tests (in addition to the existing, already failing test).	2016-04-01 22:22:03 +01:00
Alexander Ljungberg	48108cebc9	Merge branch '0.9.9'	2016-04-01 01:05:40 +02:00
Alexander Ljungberg	ecac17a00a	This will be Cappuccino 0.9.9.	2016-03-29 23:32:12 +01:00
Alexandre Wilhelm	3ba215887c	Merge pull request #2426 from mrcarlberg/source_url_fix Fixed: //@ sourceURL=... is deprecated since many years ago.	2016-03-28 23:43:45 -07:00
Alexandre Wilhelm	edbc1baf32	Merge pull request #2427 from cacaodev/cpbutton-image-scaling NEW: nib2cib support for CPButton -imageScaling.	2016-03-28 23:43:22 -07:00
Alexandre Wilhelm	a10dfa4ab4	Merge pull request #2429 from mrcarlberg/integer_value Fixed: Added ’integerValue’ method for CPNumber and CPString.	2016-03-27 09:20:12 -07:00
Martin Carlberg	b208571ed7	Fixed: Formatting	2016-03-23 10:17:15 +01:00
Martin Carlberg	c1ec27045c	Fixed: Rhino does not support numbers starting with ’0’	2016-03-23 09:35:19 +01:00
Martin Carlberg	111b12161c	Added: test cases for ’intValue’ and ’integerValue’ methods on CPString and CPNumber	2016-03-23 09:02:09 +01:00
Alexandre Wilhelm	b12d1491d4	Merge pull request #2415 from cacaodev/CPViewController-loadviewAsynchronously NEW: CPViewController -loadViewAsynchronously:(Function/view, error/)	2016-03-20 19:40:20 -07:00
Alexandre Wilhelm	6d1a094b15	Merge pull request #2428 from cacaodev/CPSearchField-indentationLevel CPSearchField: use CPMenuItem -setIndentationLevel:	2016-03-20 19:35:48 -07:00
Martin Carlberg	7780a98abe	Fixed: Added ’integerValue’ method for CPNumber and CPString. This makes the classes more compliant to Cocoa	2016-03-15 22:25:10 +01:00
cacaodev	a1248db3e7	CPSearchField: use CPMenuItem -setIndentationLevel: now that it's available.	2016-03-13 16:09:27 +01:00
cacaodev	9fab52c044	NEW: nib2cib support for CPButton -imageScaling. With manual test CPButtonTest. Fixes #2425 .	2016-03-12 22:18:46 +01:00
Aparajita Fishman	96d2b001ea	Merge branch 'tableview-edit-fix'	2016-03-08 15:04:55 -08:00
Martin Carlberg	e38d6c9f9e	Fixed: //@ sourceURL=... is deprecated since many years ago. We have not changed it for support of older browsers. Chrome version 51 and above writes a warning about it in the console so it is time now.	2016-03-07 13:44:29 +01:00
Alexandre Wilhelm	310c0e8379	Merge pull request #2423 from mrcarlberg/cpobject_controller_extension Allow CPObjectController to get more attributes from the xib/cib file.	2016-03-06 18:20:51 -08:00
Martin Carlberg	f0dbffe4f8	Fixed: Formatting	2016-03-06 11:14:22 +01:00
Alexandre Wilhelm	598a482538	New: added gitter badge in the README	2016-03-05 13:38:23 -08:00
Alexandre Wilhelm	a995f3ab52	Merge pull request #2424 from mrcarlberg/invalid_plist_fix Does not throw exception if plist is not valid. It will return nil instead	2016-03-05 13:32:15 -08:00
Martin Carlberg	ec55bddbd4	Fixed: Does not throw exception if plist is not valid. It will return nil instead.	2016-03-01 21:45:08 +01:00
Martin Carlberg	808591df56	Fixed: Allow CPObjectController to get more attributes from the xib/cib file.	2016-03-01 21:40:00 +01:00
Alexandre Wilhelm	96ae3da1e0	Merge pull request #2412 from cacaodev/CPArray-arrayByApplyingBlock-replace Replace loops with the new -arrayByApplyingBlock: method	2016-02-18 20:25:24 -08:00
Alexandre Wilhelm	4f13df69c7	Merge pull request #2419 from Dogild/cappuccino-test-launched Test: some manual tests were broken	2016-02-18 20:24:36 -08:00
Alexandre Wilhelm	6d305e4a84	Test: some manual tests were broken This PR fixes the manual tests. We can no launch every manual tests of Cappuccino...	2016-02-13 11:36:42 -08:00
cacaodev	d3dab982a1	Remove ignored argument _ in CPColorPanel	2016-02-07 11:54:16 +01:00
cacaodev	2f6adbae3c	Documentation for -loadViewWithCompletionHandler: Also clarified a note in -loadView doc.	2016-02-07 11:19:26 +01:00
cacaodev	ccdc1eed5a	Rename to loadViewWithCompletionHandler:	2016-02-07 11:17:53 +01:00
cacaodev	65dee154f7	Remove ignored argument _	2016-02-06 20:39:49 +01:00
Alexandre Wilhelm	662db009de	Merge pull request #2418 from mrcarlberg/build_with_space_in_path Fixed: Allow build in directory with space in path	2016-02-05 12:05:35 -06:00
cacaodev	d07d8f6857	_CPBlockExpression: replace loops with arrayByApplyingBlock: method	2016-02-04 21:51:37 +01:00
cacaodev	0327f6b1ea	Merge remote-tracking branch 'cappuccino/master' into CPArray-arrayByApplyingBlock-replace	2016-02-04 21:46:10 +01:00
Martin Carlberg	16dea2ee09	Fixed: Allow build in directory with space in path	2016-02-03 17:26:24 +01:00
Alexandre Wilhelm	5e3fe139fc	Fixed: @cappuccino is now a link in the README...	2016-02-02 13:05:46 -08:00
Alexandre Wilhelm	55d41fca05	New: added twitter account in the READMA	2016-02-02 13:05:01 -08:00
cacaodev	6b683bd02d	Merge pull request #2402 from cacaodev/CPExpression-constructors NEW : CPExpression +expressionForBlock:arguments: +expressionForConditional:trueExpression:falseExpression:	2016-01-25 10:22:18 +01:00
Aparajita Fishman	8908fb7ee0	Merge pull request #2414 from didierkorthoudt/CPTrackingArea-fixes2 FIXED: CPTrackingArea incorrect handling of view hierarchy updates while processing events	2016-01-23 07:02:03 -08:00
Didier Korthoudt	2877178b34	Formatting: following Aparajita's recommandations	2016-01-21 20:46:37 +01:00
Antoine Mercadal	d527139f48	Merge pull request #2416 from didierkorthoudt/CPBox-contentView-incorrect-initWithCoder FIXED: CPBox contentView incorrect initWithCoder	2016-01-20 15:11:37 -08:00
Didier Korthoudt	b3d8180541	FORMATTING: added comment to workaround	2016-01-21 00:10:38 +01:00
Didier Korthoudt	3411c340ab	FIXED: incorrect view hierarchy update	2016-01-20 23:50:22 +01:00
Didier Korthoudt	4482089712	FIXED: corrected replaceSubview parameters order	2016-01-20 22:08:10 +01:00
Didier Korthoudt	c8ce2343d7	Merge remote-tracking branch 'cappuccino/master'	2016-01-20 21:43:35 +01:00
cacaodev	d547d04277	NEW: CPViewController -loadViewAsynchronously:(Function/view, error/) with manual test CPViewControllerTest	2016-01-20 11:54:02 +01:00
Antoine Mercadal	00bdbcf857	FIXED: only set a content view of CPBox if it is not a separator	2016-01-19 16:10:31 -08:00
Antoine Mercadal	bf8070c42d	Revert "FIXED: Bug introduced by https://github.com/cappuccino/cappuccino/commit/9fba72cbab42145dc585c01efd82ce645373c04e#diff-227ef108401c2160357ae3fc65018c65R620 " This reverts commit `ad48381744`.	2016-01-19 16:08:59 -08:00
Didier Korthoudt	0f30d7744d	FIXED: CPTrackingArea incorrect handling of view hierarchy updates while processing events	2016-01-19 07:07:45 +01:00
cacaodev	095a978120	Replace loops with arrayByApplyingBlock:	2016-01-17 20:54:43 +01:00
cacaodev	1b72646772	Style: remove tabs	2016-01-17 20:54:20 +01:00
Didier Korthoudt	a7b129147f	Merge remote-tracking branch 'cappuccino/master'	2016-01-17 12:32:31 +01:00
Didier Korthoudt	ca9039b8d5	Merge remote-tracking branch 'cappuccino/master'	2016-01-16 18:22:20 +01:00
cacaodev	36c417458d	STYLE: replaced expression methods with accessors Also added methods and documentation for the new methods: -trueExpression, -falseExpression and -expressionBlock. Completed documentation for -predicate and -arguments.	2015-12-27 22:08:30 +01:00
cacaodev	f1591e593a	Coding style	2015-12-27 22:03:35 +01:00
cacaodev	117ac0f5d6	FIXED: replace js Array.map function with capp API Also fixed BlockExpression description to match a little more with cocoa impl.	2015-12-27 19:31:05 +01:00
cacaodev	e72a42fd2d	FIXED: block & conditional expressions: support for CPPredicate -predicateWithSubstitutionVariables:	2015-12-27 19:28:03 +01:00
cacaodev	07b6e2b9f1	CPExpression +expressionForConditional:trueExpression:falseExpression: Conditional Expression : an expression using different expressions for evaluation, depending of a predicate result. Support for predicate parsing: ```TERNARY(predicate, trueExpression, falseExpression)``` With init, equal, evaluation, parsing tests.	2015-12-27 15:45:03 +01:00
cacaodev	5ab10f4024	NEW: CPExpression +expressionForBlock:arguments: An expression that returns the result of evaluating a block. With tests.	2015-12-27 15:44:36 +01:00
Didier Korthoudt	b32499f6ec	Merge remote-tracking branch 'cappuccino/master'	2015-12-22 18:07:02 +01:00
Didier Korthoudt	d9819d8b3d	Merge remote-tracking branch 'cappuccino/master'	2015-12-22 08:03:54 +01:00
				`@@ -0,0 +1 @@`
				280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;18E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;11E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;10;$classnameS;18;_CPCibCustomObjectK;8;$classesA;S;18;_CPCibCustomObjectS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;19E;E;D;K;10;$classnameS;5;CPSetK;8;$classesA;S;5;CPSetS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;12E;K;15;CPSetObjectsKeyD;K;6;CP$UIDd;2;20E;E;D;K;10;$classnameS;20;CPCibOutletConnectorK;8;$classesA;S;20;CPCibOutletConnectorS;14;CPCibConnectorS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;11E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;18E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;21E;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;22E;E;D;K;10;$classnameS;18;_CPCibClassSwapperK;8;$classesA;S;18;_CPCibClassSwapperS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;17E;K;18;CPResponderMenuKeyD;K;6;CP$UIDd;1;0E;K;12;CPViewTagKeyD;K;6;CP$UIDd;2;23E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;2;24E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;2;24E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;2;25E;K;19;CPViewThemeClassKeyD;K;6;CP$UIDd;1;0E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;2;26E;K;14;CPViewScaleKeyD;K;6;CP$UIDd;2;27E;K;18;CPViewSizeScaleKeyD;K;6;CP$UIDd;2;27E;K;17;CPViewIsScaledKeyD;K;6;CP$UIDd;2;28E;K;19;CPViewAppearanceKeyD;K;6;CP$UIDd;1;0E;K;32;CPDoNotTranslateAutoresizingMaskD;K;6;CP$UIDd;2;28E;K;30;_CPCibClassSwapperClassNameKeyD;K;6;CP$UIDd;2;29E;K;38;_CPCibClassSwapperOriginalClassNameKeyD;K;6;CP$UIDd;2;30E;E;S;16;CPViewControllerD;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;S;4;viewS;13;CPApplicationd;1;0S;20;{{0, 0}, {480, 272}}d;2;12S;6;normalS;6;{1, 1}F;S;6;NSViewS;6;CPViewE;K;9;$archiverS;15;CPKeyedArchiverK;8;$versionS;6;100000E;