Merge branch 'refs/heads/master' into NEW--CPTextView

Conflicts:
	AppKit/CPControl.j

.gitignore

@@ -16,3 +16,4 @@ xcuserdata/
 Tests/Manual/**/*.xcodeproj
 *.sublime-project
 *.sublime-workspace
+*.tm_properties

AppKit/CPAlert.j

@@ -44,6 +44,7 @@
 var CPAlertDelegate_alertShowHelp_              = 1 << 0,
     CPAlertDelegate_alertDidEnd_returnCode_     = 1 << 1;
 
+@typedef CPAlertStyle
 /*
     @global
     @group CPAlertStyle
@@ -70,6 +71,54 @@ var bottomHeight = 71;
 
 @end
 
+
+@implementation _CPAlertThemeView : CPView
+
++ (CPString)defaultThemeClass
+{
+    return @"alert";
+}
+
++ (CPDictionary)themeAttributes
+{
+    return @{
+            @"size": CGSizeMake(400.0, 110.0),
+            @"content-inset": CGInsetMake(15, 15, 15, 50),
+            @"informative-offset": 6,
+            @"button-offset": 10,
+            @"message-text-alignment": CPJustifiedTextAlignment,
+            @"message-text-color": [CPColor blackColor],
+            @"message-text-font": [CPFont boldSystemFontOfSize:13.0],
+            @"message-text-shadow-color": [CPNull null],
+            @"message-text-shadow-offset": CGSizeMakeZero(),
+            @"informative-text-alignment": CPJustifiedTextAlignment,
+            @"informative-text-color": [CPColor blackColor],
+            @"informative-text-font": [CPFont systemFontOfSize:12.0],
+            @"informative-text-shadow-color": [CPNull null],
+            @"informative-text-shadow-offset": CGSizeMakeZero(),
+            @"image-offset": CGPointMake(15, 12),
+            @"information-image": [CPNull null],
+            @"warning-image": [CPNull null],
+            @"error-image": [CPNull null],
+            @"help-image": [CPNull null],
+            @"help-image-left-offset": 15,
+            @"help-image-pressed": [CPNull null],
+            @"suppression-button-y-offset": 0.0,
+            @"suppression-button-x-offset": 0.0,
+            @"default-elements-margin": 3.0,
+            @"suppression-button-text-color": [CPColor blackColor],
+            @"suppression-button-text-font": [CPFont systemFontOfSize:12.0],
+            @"suppression-button-text-shadow-color": [CPNull null],
+            @"suppression-button-text-shadow-offset": 0.0,
+            @"modal-window-button-margin-y": 0.0,
+            @"modal-window-button-margin-x": 0.0,
+            @"standard-window-button-margin-y": 0.0,
+            @"standard-window-button-margin-x": 0.0,
+        };
+}
+
+@end
+
 /*!
     @ingroup appkit
 
@@ -813,51 +862,3 @@ var bottomHeight = 71;
 }
 
 @end
-
-
-@implementation _CPAlertThemeView : CPView
-
-+ (CPString)defaultThemeClass
-{
-    return @"alert";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-            @"size": CGSizeMake(400.0, 110.0),
-            @"content-inset": CGInsetMake(15, 15, 15, 50),
-            @"informative-offset": 6,
-            @"button-offset": 10,
-            @"message-text-alignment": CPJustifiedTextAlignment,
-            @"message-text-color": [CPColor blackColor],
-            @"message-text-font": [CPFont boldSystemFontOfSize:13.0],
-            @"message-text-shadow-color": [CPNull null],
-            @"message-text-shadow-offset": CGSizeMakeZero(),
-            @"informative-text-alignment": CPJustifiedTextAlignment,
-            @"informative-text-color": [CPColor blackColor],
-            @"informative-text-font": [CPFont systemFontOfSize:12.0],
-            @"informative-text-shadow-color": [CPNull null],
-            @"informative-text-shadow-offset": CGSizeMakeZero(),
-            @"image-offset": CGPointMake(15, 12),
-            @"information-image": [CPNull null],
-            @"warning-image": [CPNull null],
-            @"error-image": [CPNull null],
-            @"help-image": [CPNull null],
-            @"help-image-left-offset": 15,
-            @"help-image-pressed": [CPNull null],
-            @"suppression-button-y-offset": 0.0,
-            @"suppression-button-x-offset": 0.0,
-            @"default-elements-margin": 3.0,
-            @"suppression-button-text-color": [CPColor blackColor],
-            @"suppression-button-text-font": [CPFont systemFontOfSize:12.0],
-            @"suppression-button-text-shadow-color": [CPNull null],
-            @"suppression-button-text-shadow-offset": 0.0,
-            @"modal-window-button-margin-y": 0.0,
-            @"modal-window-button-margin-x": 0.0,
-            @"standard-window-button-margin-y": 0.0,
-            @"standard-window-button-margin-x": 0.0,
-        };
-}
-
-@end

AppKit/CPAnimation.j

@@ -42,25 +42,10 @@ var CPAnimationDelegate_animationShouldStart_       = 1 << 1,
     CPAnimationDelegate_animationDidEnd_            = 1 << 3,
     CPAnimationDelegate_animationDidStop_           = 1 << 4;
 
-/*
-    @global
-    @group CPAnimationCurve
-*/
+@typedef CPAnimationCurve
 CPAnimationEaseInOut    = 0;
-/*
-    @global
-    @group CPAnimationCurve
-*/
 CPAnimationEaseIn       = 1;
-/*
-    @global
-    @group CPAnimationCurve
-*/
 CPAnimationEaseOut      = 2;
-/*
-    @global
-    @group CPAnimationCurve
-*/
 CPAnimationLinear       = 3;
 
 ACTUAL_FRAME_RATE = 0;

AppKit/CPApplication.j

@@ -37,6 +37,8 @@
 @import "CPWindowController.j"
 @import "_CPPopoverWindow.j"
 
+@typedef CPModalSession
+
 var CPMainCibFile               = @"CPMainCibFile",
     CPMainCibFileHumanFriendly  = @"Main cib file base name",
     CPEventModifierFlags = 0;
@@ -986,7 +988,9 @@ var CPMainCibFile               = @"CPMainCibFile",
         return;
     }
 
-    [aSheet._windowView _enableSheet:YES inWindow:aWindow];
+    if (![aWindow attachedSheet])
+        [aSheet._windowView _enableSheet:YES inWindow:aWindow];
+
     [aWindow _attachSheet:aSheet modalDelegate:aModalDelegate didEndSelector:didEndSelector contextInfo:contextInfo];
 }
 

AppKit/CPArrayController.j

@@ -23,7 +23,7 @@
  */
 
 @import <Foundation/CPIndexSet.j>
-
+@import <Foundation/CPPredicate.j>
 @import "CPObjectController.j"
 @import "CPKeyValueBinding.j"
 

AppKit/CPBox.j

@@ -24,6 +24,7 @@
 @import "CPView.j"
 
 // CPBoxType
+@typedef CPBoxType
 CPBoxPrimary    = 0;
 CPBoxSecondary  = 1;
 CPBoxSeparator  = 2;
@@ -31,12 +32,14 @@ CPBoxOldStyle   = 3;
 CPBoxCustom     = 4;
 
 // CPBorderType
+@typedef CPBorderType
 CPNoBorder      = 0;
 CPLineBorder    = 1;
 CPBezelBorder   = 2;
 CPGrooveBorder  = 3;
 
 // CPTitlePosition
+@typedef CPTitlePosition
 CPNoTitle     = 0;
 CPAboveTop    = 1;
 CPAtTop       = 2;

AppKit/CPButton.j

@@ -29,8 +29,7 @@
 @import "CPWindow_Constants.j"
 
 /* @group CPBezelStyle */
-
-                                       // IB style
+@typedef CPBezelStyle
 CPRoundedBezelStyle             = 1;   // Push
 CPRegularSquareBezelStyle       = 2;   // Bevel
 CPThickSquareBezelStyle         = 3;
@@ -49,6 +48,7 @@ CPHUDBezelStyle                 = -1;
 
 
 /* @group CPButtonType */
+@typedef CPButtonType
 CPMomentaryLightButton  = 0;
 CPPushOnPushOffButton   = 1;
 CPToggleButton          = 2;

AppKit/CPButtonBar.j

@@ -133,7 +133,11 @@
 - (void)setButtons:(CPArray)buttons
 {
     for (var i = [_buttons count] - 1; i >= 0; i--)
+    {
+        [_buttons[i] removeFromSuperview];
         [_buttons[i] removeObserver:self forKeyPath:@"hidden"];
+    }
+
 
     _buttons = [CPArray arrayWithArray:buttons];
 
@@ -230,10 +234,11 @@
     {
         var button = buttonsNotHidden[count];
 
-        [button removeFromSuperview];
-
         if ([button isHidden])
+        {
+            [button removeFromSuperview];
             [buttonsNotHidden removeObject:button];
+        }
     }
 
     var currentButtonOffset = _resizeControlIsLeftAligned ? CGRectGetMaxX([self bounds]) + 1 : -1,

AppKit/CPCollectionView.j

@@ -32,6 +32,7 @@
 @import "CPPasteboard.j"
 @import "CPView.j"
 
+@class _CPCollectionViewDropIndicator
 
 var CPCollectionViewDelegate_collectionView_acceptDrop_index_dropOperation_                 = 1 << 0,
     CPCollectionViewDelegate_collectionView_canDragItemsAtIndexes_withEvent_                = 1 << 1,

AppKit/CPColorPanel.j

@@ -27,6 +27,9 @@
 @import "CPView.j"
 
 @class CPSlider
+@class _CPColorPanelToolbar
+@class _CPColorPanelSwatches
+@class _CPColorPanelPreview
 
 @global CPApp
 

AppKit/CPColorPicker.j

@@ -25,6 +25,8 @@
 @import "CPView.j"
 
 @class CPSlider
+@class CPColorPanel
+@class __CPColorWheel
 
 @global CPColorPickerViewWidth
 @global CPColorPickerViewHeight

AppKit/CPComboBox.j

@@ -61,17 +61,19 @@ var CPComboBoxTextSubview = @"text",
 
 @implementation CPComboBox : CPTextField
 {
-    CPArray                 _items;
-    _CPPopUpList            _listDelegate;
-    CPComboBoxDataSource    _dataSource;
-    BOOL                    _usesDataSource;
-    BOOL                    _completes;
-    BOOL                    _canComplete;
-    int                     _numberOfVisibleItems;
-    BOOL                    _forceSelection;
-    BOOL                    _hasVerticalScroller;
-    CPString                _selectedStringValue;
-    BOOL                    _popUpButtonCausedResign;
+    CPArray                     _items;
+    _CPPopUpList                _listDelegate;
+    id<CPComboBoxDataSource>    _dataSource;
+    BOOL                        _usesDataSource;
+    BOOL                        _completes;
+    BOOL                        _canComplete;
+    int                         _numberOfVisibleItems;
+    BOOL                        _forceSelection;
+    BOOL                        _hasVerticalScroller;
+    CPString                    _selectedStringValue;
+    CGSize                      _intercellSpacing;
+    float                       _itemHeight;
+    BOOL                        _popUpButtonCausedResign;
 }
 
 + (CPString)defaultThemeClass
@@ -140,7 +142,9 @@ var CPComboBoxTextSubview = @"text",
         return;
 
     _hasVerticalScroller = flag;
-    [[_listDelegate scrollView] setHasVerticalScroller:flag];
+
+    if (_listDelegate)
+        [[_listDelegate scrollView] setHasVerticalScroller:_hasVerticalScroller];
 }
 
 - (CGSize)intercellSpacing
@@ -150,7 +154,13 @@ var CPComboBoxTextSubview = @"text",
 
 - (void)setIntercellSpacing:(CGSize)aSize
 {
-    [[_listDelegate tableView] setIntercellSpacing:aSize];
+    if (_intercellSpacing && CGSizeEqualToSize(aSize, _intercellSpacing))
+        return;
+
+    _intercellSpacing = aSize;
+
+    if (_listDelegate)
+        [[_listDelegate tableView] setIntercellSpacing:_intercellSpacing];
 }
 
 - (BOOL)isButtonBordered
@@ -173,10 +183,18 @@ var CPComboBoxTextSubview = @"text",
 
 - (void)setItemHeight:(float)itemHeight
 {
-    [[_listDelegate tableView] setRowHeight:itemHeight];
+    if (itemHeight === _itemHeight)
+        return;
 
-    // FIXME: This shouldn't be necessary, but CPTableView does not tile after setRowHeight
-    [[_listDelegate tableView] reloadData];
+    _itemHeight = itemHeight;
+
+    if (_listDelegate)
+    {
+        [[_listDelegate tableView] setRowHeight:_itemHeight];
+
+        // FIXME: This shouldn't be necessary, but CPTableView does not tile after setRowHeight
+        [[_listDelegate tableView] reloadData];
+    }
 }
 
 - (int)numberOfVisibleItems
@@ -451,6 +469,9 @@ var CPComboBoxTextSubview = @"text",
     // Apply our text style to the list
     [_listDelegate setFont:[self font]];
     [_listDelegate setAlignment:[self alignment]];
+    [[_listDelegate scrollView] setHasVerticalScroller:_hasVerticalScroller];
+    [[_listDelegate tableView] setIntercellSpacing:_intercellSpacing];
+    [[_listDelegate tableView] setRowHeight:_itemHeight];
 }
 
 - (int)indexOfItemWithObjectValue:(id)anObject
@@ -842,13 +863,17 @@ var CPComboBoxTextSubview = @"text",
 - (void)setFont:(CPFont)aFont
 {
     [super setFont:aFont];
-    [_listDelegate setFont:aFont];
+
+    if (_listDelegate)
+        [_listDelegate setFont:aFont];
 }
 
 - (void)setAlignment:(CPTextAlignment)alignment
 {
     [super setAlignment:alignment];
-    [_listDelegate setAlignment:alignment];
+
+    if (_listDelegate)
+        [_listDelegate setAlignment:alignment];
 }
 
 #pragma mark Pop Up Button Layout

AppKit/CPCompatibility.j

@@ -78,6 +78,8 @@ CPInputOnInputEventFeature              = 30;
 
 CPFileAPIFeature                        = 31;
 
+CPAltEnterTextAreaFeature               = 32;
+
 
 
 /*
@@ -100,6 +102,7 @@ var USER_AGENT                          = "",
 // default these features to true
 PLATFORM_FEATURES[CPInputTypeCanBeChangedFeature] = YES;
 PLATFORM_FEATURES[CPInputSetFontOutsideOfDOM] = YES;
+PLATFORM_FEATURES[CPAltEnterTextAreaFeature] = YES;
 
 if (typeof window !== "undefined" && typeof window.navigator !== "undefined")
     USER_AGENT = window.navigator.userAgent;
@@ -208,6 +211,7 @@ else if (USER_AGENT.indexOf("Gecko") !== -1) // Must follow KHTML check.
     // Some day this might be fixed and should be version prefixed. No known fixed version yet.
     PLATFORM_FEATURES[CPInput1PxLeftPadding] = YES;
 
+    PLATFORM_FEATURES[CPAltEnterTextAreaFeature] = NO;
     // This was supposed to be added in Firefox 22, but when testing with the latest beta as of 2013-06-14
     // it does not seem to work. It seems to exhibit the CPJavaScriptPasteRequiresEditableTarget problem,
     // and in addition doesn't seem to work with our native copy code either.

AppKit/CPControl.j

@@ -52,16 +52,20 @@
 @global CPTabTextMovement
 @global CPOtherTextMovement
 
+@typedef CPTextAlignment
+
 CPLeftTextAlignment      = 0;
 CPRightTextAlignment     = 1;
 CPCenterTextAlignment    = 2;
 CPJustifiedTextAlignment = 3;
 CPNaturalTextAlignment   = 4;
 
+@typedef CPControlSize
 CPRegularControlSize = 0;
 CPSmallControlSize   = 1;
 CPMiniControlSize    = 2;
 
+@typedef CPLineBreakMode
 CPLineBreakByWordWrapping     = 0;
 CPLineBreakByCharWrapping     = 1;
 CPLineBreakByClipping         = 2;
@@ -69,11 +73,13 @@ CPLineBreakByTruncatingHead   = 3;
 CPLineBreakByTruncatingTail   = 4;
 CPLineBreakByTruncatingMiddle = 5;
 
+@typedef CPVerticalTextAlignment
 CPTopVerticalTextAlignment    = 1;
 CPCenterVerticalTextAlignment = 2;
 CPBottomVerticalTextAlignment = 3;
 
 // Deprecated for use with images, use the CPImageScale constants
+@typedef CPImageScaling
 CPScaleProportionally = 0;
 CPScaleToFit          = 1;
 CPScaleNone           = 2;
@@ -83,6 +89,7 @@ CPImageScaleAxesIndependently      = 1;
 CPImageScaleNone                   = 2;
 CPImageScaleProportionallyUpOrDown = 3;
 
+@typedef CPCellImagePosition
 CPNoImage       = 0;
 CPImageOnly     = 1;
 CPImageLeft     = 2;
@@ -270,10 +277,20 @@ var CPControlBlackColor = [CPColor blackColor];
         maxSize = [self currentValueForThemeAttribute:@"max-size"];
 
     if (minSize.width > 0)
+    {
         frameSize.width = MAX(minSize.width, frameSize.width);
 
+        if (maxSize.width > 0)
+            frameSize.width = MIN(maxSize.width, frameSize.width);
+    }
+
     if (minSize.height > 0)
-        frameSize.height = minSize.height;
+    {
+        frameSize.height = MAX(minSize.height, frameSize.height);
+
+        if (maxSize.height > 0)
+            frameSize.height = MIN(maxSize.height, frameSize.height);
+    }
 
     [self setFrameSize:frameSize];
 }

AppKit/CPDatePicker/_CPDatePickerCalendar.j

@@ -29,6 +29,9 @@
 @import <Foundation/Foundation.j>
 
 @class CPDatePicker
+@class _CPDatePickerMonthView
+@class _CPDatePickerHeaderView
+@class _CPDatePickerBox
 
 @global CPApp
 @global CPSingleDateMode
@@ -63,7 +66,7 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
     _CPDatePickerMonthView          _monthView;
     _CPDatePickerHeaderView         _headerView;
     _CPDatePickerClock              _datePickerClock;
-    CPBox                           _box;
+    _CPDatePickerBox                _box;
     CPDatePicker                    _datePicker;
     CPInteger                       _startSelectionIndex;
     CPInteger                       _currentSelectionIndex;
@@ -97,7 +100,7 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
         sizeCalendar = [_datePicker valueForThemeAttribute:@"size-calendar"],
         sizeClock = [_datePicker valueForThemeAttribute:@"size-clock"];
 
-    _box = [[_DatePickerBox alloc] initWithFrame:CGRectMake(0, 0, sizeCalendar.width, sizeHeader.height + sizeCalendar.height)];
+    _box = [[_CPDatePickerBox alloc] initWithFrame:CGRectMake(0, 0, sizeCalendar.width, sizeHeader.height + sizeCalendar.height)];
     [_box setDatePicker:_datePicker];
 
     _headerView = [[_CPDatePickerHeaderView alloc] initWithFrame:CGRectMake(0, 0, sizeHeader.width, sizeHeader.height) datePicker:_datePicker delegate:self];
@@ -1266,7 +1269,7 @@ var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"
 @end
 
 
-@implementation _DatePickerBox : CPView
+@implementation _CPDatePickerBox : CPView
 {
     CPDatePicker _datePicker @accessors(property=datePicker);
 }

AppKit/CPDatePicker/_CPDatePickerTextField.j

@@ -31,6 +31,10 @@
 @import <Foundation/CPLocale.j>
 
 @class CPDatePicker
+@class _CPDatePickerElementTextField
+@class _CPDatePickerElementView
+@class _CPDatePickerMonthView
+@class _CPDatePickerHeaderView
 
 @global CPSingleDateMode
 @global CPRangeDateMode
@@ -334,10 +338,11 @@ var CPZeroKeyCode = 48,
     if ([anEvent keyCode] == CPReturnKeyCode)
     {
         [_currentTextField _endEditing];
-        return YES;
+
+        return [super performKeyEquivalent:anEvent];
     }
 
-    return NO;
+    return [super performKeyEquivalent:anEvent];
 }
 
 /*! KeyDown event
@@ -1771,6 +1776,7 @@ var CPMonthDateType = 0,
 - (void)makeSelectable
 {
     [self setThemeState:CPThemeStateSelected];
+    [_datePicker setThemeState:CPThemeStateEditing];
 }
 
 /*! Unsert the theme CPThemeStateSelected
@@ -1779,6 +1785,7 @@ var CPMonthDateType = 0,
 {
     _firstEvent = YES;
     [self unsetThemeState:CPThemeStateSelected];
+    [_datePicker unsetThemeState:CPThemeStateEditing];
 }
 
 
@@ -1847,4 +1854,4 @@ var CPMonthDateType = 0,
     return CGRectMakeCopy(bounds);
 }
 
-@end
+@end

AppKit/CPDragServer_Constants.j

@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@typedef CPDragOperation
 CPDragOperationNone     = 0;
 CPDragOperationCopy     = 1 << 1;
 CPDragOperationLink     = 1 << 1;

AppKit/CPEvent.j

@@ -30,12 +30,17 @@
 @import "CGGeometry.j"
 
 @class CPTextField
+@class CPWindow
 
 @global CPApp
 @global CPNewlineCharacter
 @global CPCarriageReturnCharacter
 @global CPEnterCharacter
 
+@typedef DOMEvent
+@typedef CPEventType
+
+
 var _CPEventPeriodicEventPeriod         = 0,
     _CPEventPeriodicEventTimer          = nil,
     _CPEventUpperCaseRegex              = new RegExp("[A-Z]"),

AppKit/CPImageView.j

@@ -29,6 +29,7 @@
 @global CPImagesPboardType
 @global appkit_tag_dom_elements
 
+@typedef CPImageAlignment
 CPImageAlignCenter      = 0;
 CPImageAlignTop         = 1;
 CPImageAlignTopLeft     = 2;

AppKit/CPKeyValueBinding.j

@@ -35,6 +35,7 @@
 var exposedBindingsMap = @{},
     bindingsMap = @{};
 
+@typedef CPBindingOperationKind
 var CPBindingOperationAnd = 0,
     CPBindingOperationOr  = 1;
 

AppKit/CPLevelIndicator.j

@@ -25,11 +25,13 @@
 
 @global CPApp
 
+@typedef CPTickMarkPosition
 CPTickMarkBelow                             = 0;
 CPTickMarkAbove                             = 1;
 CPTickMarkLeft                              = CPTickMarkAbove;
 CPTickMarkRight                             = CPTickMarkBelow;
 
+@typedef CPLevelIndicatorStyle
 CPRelevancyLevelIndicatorStyle              = 0;
 CPContinuousCapacityLevelIndicatorStyle     = 1;
 CPDiscreteCapacityLevelIndicatorStyle       = 2;

AppKit/CPMenu/_CPMenuBarWindow.j

@@ -24,6 +24,7 @@
 @import "_CPMenuManager.j"
 
 @class _CPMenuView
+@class CPMenu
 
 @global CPMenuDidAddItemNotification
 @global CPMenuDidChangeItemNotification

AppKit/CPMenu/_CPMenuWindow.j

@@ -25,6 +25,8 @@
 @import "CPWindow.j"
 @import "_CPMenuManager.j"
 
+@class _CPMenuView
+
 var _CPMenuWindowPool                       = [],
     _CPMenuWindowPoolCapacity               = 5,
 
@@ -410,7 +412,7 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 {
     // Don't return indexes of items that aren't visible.
     if (!CGRectContainsPoint([_menuClipView bounds], [_menuClipView convertPoint:aPoint fromView:nil]))
-        return NO;
+        return CPNotFound;
 
     return [_menuView itemIndexAtPoint:[_menuView convertPoint:aPoint fromView:nil]];
 }

AppKit/CPMenuItem/_CPMenuItemMenuBarView.j

@@ -25,6 +25,7 @@
 
 @class _CPMenuBarWindow
 @class _CPMenuView
+@class CPMenuItem
 
 @implementation _CPMenuItemMenuBarView : CPView
 {

AppKit/CPMenuItem/_CPMenuItemStandardView.j

@@ -24,6 +24,9 @@
 @import "CPImageView.j"
 @import "_CPImageAndTextView.j"
 
+@class CPMenuItem
+
+
 @implementation _CPMenuItemStandardView : CPView
 {
     CPMenuItem              _menuItem @accessors(property=menuItem);

AppKit/CPMenuItem/_CPMenuItemView.j

@@ -26,6 +26,7 @@
 @import "_CPMenuItemStandardView.j"
 @import "_CPMenuItemMenuBarView.j"
 
+@class CPMenuItem
 @global CPApp
 
 /*

AppKit/CPPasteboard.j

@@ -26,6 +26,7 @@
 @import <Foundation/CPDictionary.j>
 @import <Foundation/CPPropertyListSerialization.j>
 
+@class CPWebScriptObject
 
 CPGeneralPboard         = @"CPGeneralPboard";
 CPFontPboard            = @"CPFontPboard";
@@ -66,7 +67,7 @@ var CPPasteboards = nil,
     unsigned        _changeCount;
     CPString        _stateUID;
 
-    WebScriptObject _nativePasteboard;
+    CPWebScriptObject _nativePasteboard;
 }
 
 /*

AppKit/CPProgressIndicator.j

@@ -26,6 +26,7 @@
 @import "CPWindow_Constants.j"
 
 
+@typedef CPProgressIndicatorStyle
 /*
     @global
     @group CPProgressIndicatorStyle

AppKit/CPRadio.j

@@ -25,6 +25,8 @@
 
 @import "CPButton.j"
 
+@class CPRadioGroup
+
 @global CPApp
 
 

AppKit/CPResponder.j

@@ -26,6 +26,7 @@
 @import "CPEvent.j"
 
 @class CPKeyBinding
+@class CPMenu
 
 CPDeleteKeyCode         = 8;
 CPTabKeyCode            = 9;

AppKit/CPRuleEditor/CPRuleEditor.j

@@ -2207,7 +2207,7 @@ TODO: implement
         indexOfDropLine =  FLOOR(y / _sliceHeight),
         numberOfRows = [self numberOfRows];
 
-    if (indexOfDropLine < 0 || indexOfDropLine > numberOfRows || (indexOfDropLine >= [_draggingRows firstIndex] && indexOfDropLine <= [_draggingRows lastIndex] + 1))
+    if (indexOfDropLine <= 0 || indexOfDropLine > numberOfRows || (indexOfDropLine >= [_draggingRows firstIndex] && indexOfDropLine <= [_draggingRows lastIndex] + 1))
     {
         if (_subviewIndexOfDropLine !== CPNotFound && indexOfDropLine !== _subviewIndexOfDropLine)
             [self _clearDropLine];

AppKit/CPRuleEditor/CPRuleEditor_Constants.j

@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+
 CPRuleEditorPredicateLeftExpression     = "CPRuleEditorPredicateLeftExpression";
 CPRuleEditorPredicateRightExpression    = "CPRuleEditorPredicateRightExpression";
 CPRuleEditorPredicateComparisonModifier = "CPRuleEditorPredicateComparisonModifier";
@@ -36,5 +37,6 @@ CPRuleEditorNestingModeList     = 1;        // Allows a single list, with no nes
 CPRuleEditorNestingModeCompound = 2;        // Unlimited nesting and compound rows; this is the default
 CPRuleEditorNestingModeSimple   = 3;        // One compound row at the top with subrows beneath it, and no further nesting allowed
 
+@typedef CPRuleEditorRowType
 CPRuleEditorRowTypeSimple       = 0;
 CPRuleEditorRowTypeCompound     = 1;

AppKit/CPRuleEditor/_CPPredicateEditorTree.j

@@ -20,6 +20,8 @@
 @import <Foundation/CPObject.j>
 @import <Foundation/CPString.j>
 
+@class CPPredicateEditorRowTemplate
+
 @implementation _CPPredicateEditorTree : CPObject
 {
     CPPredicateEditorRowTemplate         template @accessors;

AppKit/CPRuleEditor/_CPRuleEditorViewSlice.j

@@ -19,6 +19,8 @@
 
 @import "CPView.j"
 
+@class CPRuleEditor
+
 @implementation _CPRuleEditorViewSlice : CPView
 {
     CPRuleEditor _ruleEditor;

AppKit/CPRuleEditor/_CPRuleEditorViewSliceRow.j

@@ -122,8 +122,8 @@
 {
     var title   = [[itemsArray objectAtIndex:index] title],
         font    = [_ruleEditor font],
-        width   = [title sizeWithFont:font].width + 20,
-        rect    = CGRectMake(0, 0, (width - width % 40) + 80, [_ruleEditor rowHeight]),
+        width   = [title sizeWithFont:font].width + 35, // 35 for right arrows + margins
+        rect    = CGRectMake(0, 0, width, [_ruleEditor rowHeight]),
         popup   = [[CPPopUpButton alloc] initWithFrame:rect];
 
     [popup setValue:font forThemeAttribute:@"font"];
@@ -315,8 +315,14 @@
         {
             [ruleView setControlSize:CPSmallControlSize];
 
+            var minSize = [ruleView currentValueForThemeAttribute:@"min-size"],
+                frame = [ruleView frame];
+
+            // Force controls to their minimum size
+            frame.size.height = minSize.height;
+            [ruleView setFrame:frame];
+
             [_ruleOptionViews addObject:ruleView];
-            var frame = [ruleView frame];
             [_ruleOptionInitialViewFrames addObject:frame];
             [_ruleOptionFrames addObject:frame];
 

AppKit/CPScroller.j

@@ -33,6 +33,7 @@
 @global CPApp
 
 // CPScroller Constants
+@typedef CPScrollerPart
 CPScrollerNoPart            = 0;
 CPScrollerDecrementPage     = 1;
 CPScrollerKnob              = 2;
@@ -44,6 +45,7 @@ CPScrollerKnobSlot          = 6;
 CPScrollerIncrementArrow    = 0;
 CPScrollerDecrementArrow    = 1;
 
+@typedef CPUsableScrollerParts
 CPNoScrollerParts           = 0;
 CPOnlyScrollerArrows        = 1;
 CPAllScrollerParts          = 2;

AppKit/CPSegmentedControl.j

@@ -28,6 +28,7 @@
 
 @global CPApp
 
+@typedef CPSegmentSwitchTracking
 CPSegmentSwitchTrackingSelectOne = 0;
 CPSegmentSwitchTrackingSelectAny = 1;
 CPSegmentSwitchTrackingMomentary = 2;

AppKit/CPShadowView.j

@@ -26,7 +26,7 @@
 @import "CPImage.j"
 @import "CPView.j"
 
-
+@typedef CPShadowWeight
 CPLightShadow   = 0;
 CPHeavyShadow   = 1;
 

AppKit/CPTabView.j

@@ -25,6 +25,7 @@
 @import "CPTabViewItem.j"
 @import "CPView.j"
 
+@typedef CPTabViewType
 CPTopTabsBezelBorder     = 0;
 //CPLeftTabsBezelBorder  = 1;
 CPBottomTabsBezelBorder  = 2;

AppKit/CPTabViewItem.j

@@ -23,7 +23,7 @@
 @import <Foundation/CPObject.j>
 
 @import "CPView.j"
-
+@class CPTabView
 
 /*
     The tab is currently selected.

AppKit/CPTableColumn.j

@@ -31,6 +31,7 @@
 @global CPTableViewColumnDidResizeNotification
 
 @class _CPTableColumnHeaderView
+@class CPTableView
 
 CPTableColumnNoResizing         = 0;
 CPTableColumnAutoresizingMask   = 1 << 0;

AppKit/CPTableView.j

@@ -42,6 +42,7 @@
 @class CPTableHeaderView
 @class CPClipView
 @class CPButton
+@class _CPDropOperationDrawingView
 
 @global CPApp
 
@@ -170,7 +171,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 
 @implementation _CPTableDrawView : CPView
 {
-    CPTableView _tableView;
+    id _tableView;
 }
 
 - (id)initWithTableView:(CPTableView)aTableView

AppKit/CPTextField.j

@@ -41,15 +41,17 @@
 
 var CPTextFieldDelegate_control_didFailToFormatString_errorDescription_ = 1 << 1;
 
+@typedef CPTextFieldBezelStyle
 CPTextFieldSquareBezel          = 0;    /*! A textfield bezel with squared corners. */
 CPTextFieldRoundedBezel         = 1;    /*! A textfield bezel with rounded corners. */
 
 CPTextFieldDidFocusNotification = @"CPTextFieldDidFocusNotification";
 CPTextFieldDidBlurNotification  = @"CPTextFieldDidBlurNotification";
 
-var CPTextFieldDOMInputElement = nil,
-    CPTextFieldDOMPasswordInputElement = nil,
+var CPTextFieldDOMCurrentElement = nil,
+    CPTextFieldDOMTextAreaElement = nil,
     CPTextFieldDOMStandardInputElement = nil,
+    CPTextFieldDOMPasswordInputElement = nil,
     CPTextFieldInputOwner = nil,
     CPTextFieldTextDidChangeValue = nil,
     CPTextFieldInputResigning = NO,
@@ -142,6 +144,9 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     // NS-style Display Properties
     CPTextFieldBezelStyle       _bezelStyle;
     BOOL                        _isBordered;
+    BOOL                        _usesSingleLineMode;
+    BOOL                        _wraps;
+    BOOL                        _scrolls;
 }
 
 + (Class)_binderClassForBinding:(CPString)aBinding
@@ -240,101 +245,112 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         [self _sizeToControlSize];
 }
 
-#pragma mark -
 
+#pragma mark -
 
 #if PLATFORM(DOM)
 - (DOMElement)_inputElement
 {
-    if (!CPTextFieldDOMInputElement)
+    if (!CPTextFieldDOMTextAreaElement)
     {
-        CPTextFieldDOMInputElement = document.createElement("input");
-        CPTextFieldDOMInputElement.style.position = "absolute";
-        CPTextFieldDOMInputElement.style.border = "0px";
-        CPTextFieldDOMInputElement.style.padding = "0px";
-        CPTextFieldDOMInputElement.style.margin = "0px";
-        CPTextFieldDOMInputElement.style.whiteSpace = "pre";
-        CPTextFieldDOMInputElement.style.background = "transparent";
-        CPTextFieldDOMInputElement.style.outline = "none";
+        CPTextFieldDOMTextAreaElement                  = document.createElement("textarea");
+        CPTextFieldDOMTextAreaElement.style.position   = "absolute";
+        CPTextFieldDOMTextAreaElement.style.border     = "0px";
+        CPTextFieldDOMTextAreaElement.style.padding    = "0px";
+        CPTextFieldDOMTextAreaElement.style.margin     = "0px";
+        CPTextFieldDOMTextAreaElement.style.background = "transparent";
+        CPTextFieldDOMTextAreaElement.style.outline    = "none";
+        CPTextFieldDOMTextAreaElement.style.resize     = "none";
+        CPTextFieldDOMTextAreaElement.style.overflow   = "hidden";
+        CPTextFieldDOMTextAreaElement.spellcheck       = NO;
+    }
 
+    if (!CPTextFieldDOMStandardInputElement)
+    {
+        CPTextFieldDOMStandardInputElement                  = document.createElement("input");
+        CPTextFieldDOMStandardInputElement.style.position   = "absolute";
+        CPTextFieldDOMStandardInputElement.style.border     = "0px";
+        CPTextFieldDOMStandardInputElement.style.padding    = "0px";
+        CPTextFieldDOMStandardInputElement.style.margin     = "0px";
+        CPTextFieldDOMStandardInputElement.style.whiteSpace = "pre";
+        CPTextFieldDOMStandardInputElement.style.background = "transparent";
+        CPTextFieldDOMStandardInputElement.style.outline    = "none";
+        CPTextFieldDOMStandardInputElement.spellcheck       = NO;
+    }
+
+    if (!CPTextFieldDOMPasswordInputElement)
+    {
+        CPTextFieldDOMPasswordInputElement                  = document.createElement("input");
+        CPTextFieldDOMPasswordInputElement.style.position   = "absolute";
+        CPTextFieldDOMPasswordInputElement.style.border     = "0px";
+        CPTextFieldDOMPasswordInputElement.style.padding    = "0px";
+        CPTextFieldDOMPasswordInputElement.style.margin     = "0px";
+        CPTextFieldDOMPasswordInputElement.style.whiteSpace = "pre";
+        CPTextFieldDOMPasswordInputElement.style.background = "transparent";
+        CPTextFieldDOMPasswordInputElement.style.outline    = "none";
+        CPTextFieldDOMPasswordInputElement.type             = "password";
+        CPTextFieldDOMPasswordInputElement.spellcheck       = NO;
+    }
+
+    if (!CPTextFieldBlurHandler)
+    {
         CPTextFieldBlurHandler = function(anEvent)
         {
             return CPTextFieldBlurFunction(
                         anEvent,
                         CPTextFieldInputOwner,
                         CPTextFieldInputOwner ? CPTextFieldInputOwner._DOMElement : nil,
-                        CPTextFieldDOMInputElement,
+                        CPTextFieldDOMCurrentElement,
                         CPTextFieldInputResigning,
                         @ref(CPTextFieldInputDidBlur));
         };
+    }
 
-        if (CPFeatureIsCompatible(CPInputOnInputEventFeature))
+    if (!CPTextFieldInputFunction)
+    {
+        if (!CPFeatureIsCompatible(CPInputOnInputEventFeature))
+            return;
+
+        CPTextFieldInputFunction = function(anEvent)
         {
-            CPTextFieldInputFunction = function(anEvent)
-            {
-                if (!CPTextFieldInputOwner)
-                    return;
+            if (!CPTextFieldInputOwner)
+                return;
 
-                var cappEvent = [CPEvent keyEventWithType:CPKeyUp
-                                                 location:CGPointMakeZero()
-                                            modifierFlags:0
-                                                timestamp:[CPEvent currentTimestamp]
-                                             windowNumber:[[CPApp keyWindow] windowNumber]
-                                                  context:nil
-                                               characters:nil
-                              charactersIgnoringModifiers:nil
-                                                isARepeat:NO
-                                                  keyCode:nil];
+            var cappEvent = [CPEvent keyEventWithType:CPKeyUp
+                                             location:CGPointMakeZero()
+                                        modifierFlags:0
+                                            timestamp:[CPEvent currentTimestamp]
+                                         windowNumber:[[CPApp keyWindow] windowNumber]
+                                              context:nil
+                                           characters:nil
+                          charactersIgnoringModifiers:nil
+                                            isARepeat:NO
+                                              keyCode:nil];
 
-                [CPTextFieldInputOwner keyUp:cappEvent];
+            [CPTextFieldInputOwner keyUp:cappEvent];
 
-                [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-            }
-
-            CPTextFieldDOMInputElement.oninput = CPTextFieldInputFunction;
+            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
         }
 
-        // FIXME make this not onblur
-        CPTextFieldDOMInputElement.onblur = CPTextFieldBlurHandler;
+        CPTextFieldDOMPasswordInputElement.oninput = CPTextFieldInputFunction;
+        CPTextFieldDOMPasswordInputElement.onblur = CPTextFieldBlurHandler;
 
-        CPTextFieldDOMStandardInputElement = CPTextFieldDOMInputElement;
+        CPTextFieldDOMStandardInputElement.oninput = CPTextFieldInputFunction;
+        CPTextFieldDOMPasswordInputElement.onblur = CPTextFieldBlurHandler;
+
+        CPTextFieldDOMTextAreaElement.oninput = CPTextFieldInputFunction;
+        CPTextFieldDOMTextAreaElement.onblur = CPTextFieldBlurHandler;
     }
 
-    if (CPFeatureIsCompatible(CPInputTypeCanBeChangedFeature))
-    {
-        if ([self isSecure])
-            CPTextFieldDOMInputElement.type = "password";
-        else
-            CPTextFieldDOMInputElement.type = "text";
-
-        return CPTextFieldDOMInputElement;
-    }
 
     if ([self isSecure])
-    {
-        if (!CPTextFieldDOMPasswordInputElement)
-        {
-            CPTextFieldDOMPasswordInputElement = document.createElement("input");
-            CPTextFieldDOMPasswordInputElement.style.position = "absolute";
-            CPTextFieldDOMPasswordInputElement.style.border = "0px";
-            CPTextFieldDOMPasswordInputElement.style.padding = "0px";
-            CPTextFieldDOMPasswordInputElement.style.margin = "0px";
-            CPTextFieldDOMPasswordInputElement.style.whiteSpace = "pre";
-            CPTextFieldDOMPasswordInputElement.style.background = "transparent";
-            CPTextFieldDOMPasswordInputElement.style.outline = "none";
-            CPTextFieldDOMPasswordInputElement.type = "password";
-
-            CPTextFieldDOMPasswordInputElement.onblur = CPTextFieldBlurHandler;
-        }
-
-        CPTextFieldDOMInputElement = CPTextFieldDOMPasswordInputElement;
-    }
+        CPTextFieldDOMCurrentElement = CPTextFieldDOMPasswordInputElement;
+    else if (_usesSingleLineMode)
+        CPTextFieldDOMCurrentElement = CPTextFieldDOMStandardInputElement;
     else
-    {
-        CPTextFieldDOMInputElement = CPTextFieldDOMStandardInputElement;
-    }
+        CPTextFieldDOMCurrentElement = CPTextFieldDOMTextAreaElement;
 
-    return CPTextFieldDOMInputElement;
+    return CPTextFieldDOMCurrentElement;
 }
 #endif
 
@@ -350,8 +366,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         _sendActionOn = CPKeyUpMask | CPKeyDownMask;
 
         [self setValue:CPLeftTextAlignment forThemeAttribute:@"alignment"];
-
-        [self _updateCursor];
     }
 
     return self;
@@ -373,8 +387,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     if (shouldBeEditable)
         _isSelectable = YES;
 
-    [self _updateCursor];
-
     if (_isEditable)
         [self setThemeState:CPThemeStateEditable];
     else
@@ -405,7 +417,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 - (void)setEnabled:(BOOL)shouldBeEnabled
 {
     [super setEnabled:shouldBeEnabled];
-    [self _updateCursor];
 
     // We only allow first responder status if the field is enabled.
     if (!shouldBeEnabled && [[self window] firstResponder] === self)
@@ -419,8 +430,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 - (void)setSelectable:(BOOL)aFlag
 {
     _isSelectable = aFlag;
-
-    [self _updateCursor];
 }
 
 /*!
@@ -560,6 +569,24 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     return _textFieldBackgroundColor;
 }
 
+/*! @ignore */
+- (void)_setUsesSingleLineMode:(BOOL)aFlag
+{
+    _usesSingleLineMode = aFlag;
+}
+
+/*! @ignore */
+- (void)_setWraps:(BOOL)aFlag
+{
+    _wraps = aFlag;
+}
+
+/*! @ignore */
+- (void)_setScrolls:(BOOL)aFlag
+{
+    _scrolls = aFlag;
+}
+
 /*! @ignore */
 - (BOOL)acceptsFirstResponder
 {
@@ -615,28 +642,10 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
     [self _setCSSStyleForInputElement];
 
-    var element = [self _inputElement],
-        font = [self currentValueForThemeAttribute:@"font"],
-        contentRect = [self contentRectForBounds:[self bounds]],
-        left = CGRectGetMinX(contentRect);
-
+    var element = [self _inputElement];
     element.value = _stringValue;
-
-    // If the browser has a built in left padding, compensate for it. We need the input text to be exactly on top of the original text.
-    if (CPFeatureIsCompatible(CPInput1PxLeftPadding))
-        left -= 1;
-
-    element.style.left = left + "px";
-    element.style.width = CGRectGetWidth(contentRect) + "px";
-    element.style.verticalAlign = "top";
-    element.style.cursor = "auto";
-
     _DOMElement.appendChild(element);
 
-    // The font change above doesn't work for some browsers if the element isn't already appendChild'ed.
-    if (!CPFeatureIsCompatible(CPInputSetFontOutsideOfDOM))
-        element.style.font = [font cssString];
-
     CPTextFieldInputIsActive = YES;
 
     if (document.attachEvent)
@@ -680,37 +689,18 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 */
 - (void)_setCSSStyleForInputElement
 {
-
 #if PLATFORM(DOM)
-    var element = [self _inputElement],
-        font = [self currentValueForThemeAttribute:@"font"],
-        lineHeight = [font defaultLineHeightForFont],
-        contentRect = [self contentRectForBounds:[self bounds]],
-        verticalAlign = [self currentValueForThemeAttribute:"vertical-alignment"];
 
-    if ([self hasThemeState:CPTextFieldStatePlaceholder])
-        element.style.color = [[self valueForThemeAttribute:@"text-color" inState:CPTextFieldStatePlaceholder] cssString];
-    else
-        element.style.color = [[self valueForThemeAttribute:@"text-color" inState:CPThemeStateEditing] cssString];
+    var element       = [self _inputElement],
+        font          = [self currentValueForThemeAttribute:@"font"],
+        lineHeight    = [font defaultLineHeightForFont],
+        contentRect   = [self contentRectForBounds:[self bounds]],
+        verticalAlign = [self currentValueForThemeAttribute:"vertical-alignment"],
+        left          = CGRectGetMinX(contentRect);
 
-    if (CPFeatureIsCompatible(CPInputSetFontOutsideOfDOM))
-        element.style.font = [font cssString];
-
-    element.style.zIndex = 1000;
-
-    switch ([self alignment])
-    {
-        case CPCenterTextAlignment:
-            element.style.textAlign = "center";
-            break;
-
-        case CPRightTextAlignment:
-            element.style.textAlign = "right";
-            break;
-
-        default:
-            element.style.textAlign = "left";
-    }
+    // If the browser has a built in left padding, compensate for it. We need the input text to be exactly on top of the original text.
+    if (CPFeatureIsCompatible(CPInput1PxLeftPadding))
+        left -= 1;
 
     switch (verticalAlign)
     {
@@ -731,12 +721,41 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
             break;
     }
 
-    element.style.top = topPoint;
-    element.style.height = ROUND(lineHeight) + "px";
-    element.style.lineHeight = ROUND(lineHeight) + "px";
+    if ([self hasThemeState:CPTextFieldStatePlaceholder])
+        element.style.color = [[self valueForThemeAttribute:@"text-color" inState:CPTextFieldStatePlaceholder] cssString];
+    else
+        element.style.color = [[self valueForThemeAttribute:@"text-color" inState:CPThemeStateEditing] cssString];
+
+    switch ([self alignment])
+    {
+        case CPCenterTextAlignment:
+            element.style.textAlign = "center";
+            break;
+
+        case CPRightTextAlignment:
+            element.style.textAlign = "right";
+            break;
+
+        default:
+            element.style.textAlign = "left";
+    }
+
+    var isTextArea  = element.nodeName.toUpperCase() == "TEXTAREA";
+
+    element.style.zIndex        = 1000;
+    element.style.top           = topPoint;
+    element.style.lineHeight    = ROUND(lineHeight) + "px";
+    element.style.height        = isTextArea ? CGRectGetHeight(contentRect) + "px" : ROUND(lineHeight) + "px";;
+    element.style.width         = CGRectGetWidth(contentRect) + "px";
+    element.style.left          = left + "px";
+    element.style.verticalAlign = "top";
+    element.style.cursor        = "auto";
+    element.style.font          = [font cssString];
+
+    if (isTextArea)
+        element.style.whiteSpace = _wraps ? "pre" : "nowrap";
 
 #endif
-
 }
 
 /*! @ignore */
@@ -930,6 +949,12 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
 }
 
+- (void)mouseMoved:(CPEvent)anEvent
+{
+    [super mouseMoved:anEvent];
+    [self _updateCursorForEvent:anEvent];
+}
+
 - (void)mouseDown:(CPEvent)anEvent
 {
     // Don't track! (ever?)
@@ -1100,7 +1125,11 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         range = [self selectedRange],
         element = [self _inputElement];
 
-    element.value = [element.value stringByReplacingCharactersInRange:[self selectedRange] withString:aCharacter];
+    // we don't need to do this in case of textarea
+    // or we will end up with 2 carriage returns
+    if (aCharacter != CPNewlineCharacter || element.nodeName.toUpperCase() != "TEXTAREA" || !CPFeatureIsCompatible(CPAltEnterTextAreaFeature))
+        element.value = [element.value stringByReplacingCharactersInRange:[self selectedRange] withString:aCharacter];
+
     [self _setStringValue:element.value];
 
     // NOTE: _stringValue is now the current input element value
@@ -1140,9 +1169,14 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     [super textDidChange:note];
 }
 
-- (void)_updateCursor
+- (void)_updateCursorForEvent:(CPEvent)anEvent
 {
-    if ([self isEnabled] && ([self isSelectable] || [self isEditable]))
+    var frame = CGRectMakeCopy([self frame]),
+        contentInset = [self currentValueForThemeAttribute:@"content-inset"];
+
+    frame = [[self superview] convertRectToBase:CGRectInsetByInset(frame, contentInset)];
+
+    if ([self isEnabled] && ([self isSelectable] || [self isEditable]) && CGRectContainsPoint(frame, [anEvent locationInWindow]))
     {
 #if PLATFORM(DOM)
         self._DOMElement.style.cursor = "text";
@@ -1940,7 +1974,11 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
     CPTextFieldLineBreakModeKey         = "CPTextFieldLineBreakModeKey",
     CPTextFieldAlignmentKey             = "CPTextFieldAlignmentKey",
     CPTextFieldBackgroundColorKey       = "CPTextFieldBackgroundColorKey",
-    CPTextFieldPlaceholderStringKey     = "CPTextFieldPlaceholderStringKey";
+    CPTextFieldPlaceholderStringKey     = "CPTextFieldPlaceholderStringKey",
+    CPTextFieldUsesSingleLineMode       = "CPTextFieldUsesSingleLineMode",
+    CPTextFieldWraps                    = "CPTextFieldWraps",
+    CPTextFieldScrolls                  = "CPTextFieldScrolls";
+
 
 @implementation CPTextField (CPCoding)
 
@@ -1967,7 +2005,9 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
 
         [self setPlaceholderString:[aCoder decodeObjectForKey:CPTextFieldPlaceholderStringKey]];
 
-        [self _updateCursor];
+        [self _setUsesSingleLineMode:[aCoder decodeBoolForKey:CPTextFieldUsesSingleLineMode]];
+        [self _setWraps:[aCoder decodeBoolForKey:CPTextFieldWraps]];
+        [self _setScrolls:[aCoder decodeBoolForKey:CPTextFieldScrolls]];
     }
 
     return self;
@@ -1992,6 +2032,10 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
     [aCoder encodeInt:[self alignment] forKey:CPTextFieldAlignmentKey];
 
     [aCoder encodeObject:_placeholderString forKey:CPTextFieldPlaceholderStringKey];
+
+    [aCoder encodeBool:_usesSingleLineMode forKey:CPTextFieldUsesSingleLineMode];
+    [aCoder encodeBool:_wraps forKey:CPTextFieldWraps];
+    [aCoder encodeBool:_scrolls forKey:CPTextFieldScrolls];
 }
 
 @end
@@ -2022,6 +2066,23 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
     [_source setObjectValue:aValue];
 }
 
+- (void)reverseSetValueFor:(CPString)aBinding
+{
+    var destination = [_info objectForKey:CPObservedObjectKey],
+        keyPath     = [_info objectForKey:CPObservedKeyPathKey],
+        options     = [_info objectForKey:CPOptionsKey],
+        newValue    = [self valueForBinding:aBinding],
+        value       = [destination valueForKeyPath:keyPath];
+
+    if (CPIsControllerMarker(value) && newValue === nil) return;
+
+    newValue = [self reverseTransformValue:newValue withOptions:options];
+
+    [self suppressSpecificNotificationFromObject:destination keyPath:keyPath];
+    [destination setValue:newValue forKeyPath:keyPath];
+    [self unsuppressSpecificNotificationFromObject:destination keyPath:keyPath];
+}
+
 @end
 
 @implementation _CPTextFieldPatternValueBinder : CPValueWithPatternBinding

AppKit/CPTheme.j

@@ -26,6 +26,7 @@
 @import <Foundation/CPKeyedUnarchiver.j>
 
 @class CPView
+@class _CPThemeAttribute
 
 var CPThemesByName          = { },
     CPThemeDefaultTheme     = nil,

AppKit/CPTokenField.j

@@ -33,6 +33,9 @@
 @import "CPTextField.j"
 @import "CPWindow_Constants.j"
 
+@class _CPTokenFieldTokenCloseButton
+@class _CPTokenFieldTokenDisclosureButton
+
 @global CPApp
 @global CPTextFieldDidFocusNotification
 @global CPTextFieldDidBlurNotification

AppKit/CPToolbar.j

@@ -37,6 +37,8 @@ var CPToolbarDelegate_toolbar_itemForItemIdentifier_willBeInsertedIntoToolbar_
     CPToolbarDelegate_toolbarSelectableItemIdentifiers_                         = 1 << 4,
     CPToolbarDelegate_toolbarWillAddItem_                                       = 1 << 5;
 
+
+@typedef CPToolbarDisplayMode
 /*
     @global
     @group CPToolbarDisplayMode
@@ -58,7 +60,7 @@ CPToolbarDisplayModeIconOnly            = 2;
 */
 CPToolbarDisplayModeLabelOnly           = 3;
 
-
+@typedef CPToolbarSizeMode
 CPToolbarSizeModeDefault                = 0;
 CPToolbarSizeModeRegular                = 1;
 CPToolbarSizeModeSmall                  = 2;

AppKit/CPView.j

@@ -40,9 +40,12 @@
 @class CPMenu
 @class CPClipView
 @class CPScrollView
+@class CALayer
 
 @global appkit_tag_dom_elements
 
+@typedef _CPViewFullScreenModeState
+
 #if PLATFORM(DOM)
 
 if (typeof(appkit_tag_dom_elements) !== "undefined" && appkit_tag_dom_elements)

AppKit/CPViewController.j

@@ -210,6 +210,7 @@ var CPViewControllerCachedCibs;
             [cibOwner viewControllerDidLoadCib:self];
 
         _isLoading = NO;
+        _isLazy = NO;
         [self _viewDidLoad];
     }
     else if (_isLazy)

AppKit/CPWebView.j

@@ -23,6 +23,7 @@
 @import "CPView.j"
 @import "CPScrollView.j"
 
+@class CPWebScriptObject
 
 // FIXME: implement these where possible:
 /*
@@ -93,7 +94,7 @@ CPWebViewAppKitScrollMaxPollCount                  = 3;
     CPScrollView        _scrollView;
     CPView              _frameView;
 
-    IFrame              _iframe;
+    DOMElement          _iframe;
     CPString            _mainFrameURL;
     CPArray             _backwardStack;
     CPArray             _forwardStack;

AppKit/CPWindow/CPWindow.j

@@ -50,9 +50,15 @@
 
 @class CPMenu
 @class CPProgressIndicator
+@class CPToolbar
+@class CPWindowController
+@class _CPWindowFrameAnimation
 
 @global CPApp
 
+@typedef _CPWindowFullPlatformWindowSession
+
+
 @protocol CPWindowDelegate <CPObject>
 
 @optional
@@ -1846,6 +1852,12 @@ CPTexturedBackgroundWindowMask
             if (_leftMouseDownView !== _firstResponder && [_leftMouseDownView acceptsFirstResponder])
                 [self makeFirstResponder:_leftMouseDownView];
 
+            var keyWindow = [CPApp keyWindow];
+
+            // This is only when we move from a platform to another one
+            if ([keyWindow platformWindow] != [self platformWindow])
+                [self makeKeyAndOrderFront:self];
+
             [CPApp activateIgnoringOtherApps:YES];
 
             var theWindow = [anEvent window],
@@ -2477,7 +2489,7 @@ CPTexturedBackgroundWindowMask
                 if (currentWindow === self || currentWindow === menuWindow)
                     continue;
 
-                if ([currentWindow isVisible] && [currentWindow canBecomeKeyWindow])
+                if ([currentWindow isVisible] && [currentWindow canBecomeKeyWindow] && [currentWindow platformWindow] == [keyWindow platformWindow])
                 {
                     [currentWindow makeKeyWindow];
                     break;
@@ -2679,6 +2691,23 @@ CPTexturedBackgroundWindowMask
     [attachedSheet setFrame:sheetFrame display:YES animate:NO];
 }
 
+- (void)_previousSheetIsClosedNotification:(CPNotification)aNotification
+{
+    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPWindowDidEndSheetNotification object:self];
+
+    var sheet = _sheetContext[@"nextSheet"],
+        modalDelegate =_sheetContext[@"nextModalDelegate"],
+        endSelector = _sheetContext[@"nextEndSelector"],
+        contextInfo = _sheetContext[@"nextContextInfo"];
+
+    // Needed, because when the notification CPWindowDidEndSheetNotification is sent, the sheetContext is not up to date...
+    setTimeout(function()
+    {
+        [sheet._windowView _enableSheet:YES inWindow:self];
+        [self _attachSheet:sheet modalDelegate:modalDelegate didEndSelector:endSelector contextInfo:contextInfo];
+    }, 0)
+}
+
 /*
     Starting point for sheet session, called from CPApplication beginSheet:
 */
@@ -2687,9 +2716,24 @@ CPTexturedBackgroundWindowMask
 {
     if (_sheetContext)
     {
-        [CPException raise:CPInternalInconsistencyException
-            reason:@"The target window of beginSheet: already has a sheet, did you forget orderOut: ?"];
-        return;
+        // Here we wait till the current sheet is closed
+        if (_sheetContext[@"isClosing"])
+        {
+            // Here we save the next sheet to open
+            _sheetContext[@"nextSheet"] = aSheet;
+            _sheetContext[@"nextModalDelegate"] = aModalDelegate;
+            _sheetContext[@"nextEndSelector"] = didEndSelector;
+            _sheetContext[@"nextContextInfo"] = contextInfo;
+
+            [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_previousSheetIsClosedNotification:) name:CPWindowDidEndSheetNotification object:self];
+            return;
+        }
+        else
+        {
+            [CPException raise:CPInternalInconsistencyException
+                reason:@"The target window of beginSheet: already has a sheet, did you forget orderOut: ?"];
+            return;
+        }
     }
 
     _sheetContext = {
@@ -2741,7 +2785,12 @@ CPTexturedBackgroundWindowMask
 */
 - (void)_detachSheetWindow
 {
+    if (_sheetContext["isClosing"])
+        return;
+
     _sheetContext["isAttached"] = NO;
+    _sheetContext["isClosing"] = YES;
+    _sheetContext["opened"] = NO;
 
     // A timer seems to be necessary for the animation to work correctly.
     // It would be ideal to block here and spin the event loop, until attach is complete.
@@ -2874,12 +2923,6 @@ CPTexturedBackgroundWindowMask
         return;
     }
 
-    if (_sheetContext["isClosing"])
-        return;
-
-    _sheetContext["opened"] = NO;
-    _sheetContext["isClosing"] = YES;
-
     // The parent window can be orderedOut to disable the sheet animate out, as in Cocoa
     if ([self isVisible])
     {

AppKit/CPWindow/CPWindow_Constants.j

@@ -81,6 +81,7 @@ CPWindowMinYMargin              = 8;
 CPWindowHeightSizable           = 16;
 CPWindowMaxYMargin              = 32;
 
+@typedef CPWindowLevel
 CPBackgroundWindowLevel         = -1;
 /*
     Default level for windows
@@ -143,6 +144,7 @@ CPDraggingWindowLevel           = 500;
 */
 CPScreenSaverWindowLevel        = 1000;
 
+@typedef CPWindowOrderingMode
 /*
     The receiver is placed directly in front of the window specified.
     @global

AppKit/CoreGraphics/CGAffineTransform.j

@@ -22,6 +22,8 @@
 
 @import "CGGeometry.j"
 
+@typedef CGAffineTransform
+
 
 function CGAffineTransformMake(a, b, c, d, tx, ty)
 {

AppKit/CoreGraphics/CGColorSpace.j

@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@typedef CGColorSpace
+
 kCGColorSpaceModelUnknown       = -1;
 kCGColorSpaceModelMonochrome    = 0;
 kCGColorSpaceModelRGB           = 1;

AppKit/CoreGraphics/CGContext.j

@@ -25,6 +25,7 @@
 @import "CGGeometry.j"
 @import "CGPath.j"
 
+@typedef CGContext
 
 kCGLineCapButt              = 0;
 kCGLineCapRound             = 1;

AppKit/CoreGraphics/CGGradient.j

@@ -23,6 +23,7 @@
 @import "CGColor.j"
 @import "CGColorSpace.j"
 
+@typedef CGGradient
 
 kCGGradientDrawsBeforeStartLocation = 1 << 0;
 kCGGradientDrawsAfterEndLocation    = 1 << 1;

AppKit/CoreGraphics/CGPath.j

@@ -23,6 +23,7 @@
 @import "CGAffineTransform.j"
 @import "CGGeometry.j"
 
+@typedef CGPath
 
 kCGPathElementMoveToPoint           = 0;
 kCGPathElementAddLineToPoint        = 1;
@@ -629,4 +630,4 @@ function CGPathContainsPoint(aPath, aTransform, point, eoFill)
 
 /*!
     @}
-*/
+*/

AppKit/Platform/CPPlatformWindow.j

@@ -27,9 +27,12 @@
 
 @class CPMenu
 @class CPPlatformPasteboard
+@class CPWindow
 
 @global CPApp
 
+@typedef DOMWindow
+
 var PrimaryPlatformWindow   = NULL;
 
 @implementation CPPlatformWindow : CPObject

AppKit/Platform/DOM/CPPlatformWindow+DOM.j

@@ -1143,7 +1143,7 @@ var PreventScroll = true;
 
         _mouseDownIsRightClick = button == 2 || (CPBrowserIsOperatingSystem(CPMacOperatingSystem) && button == 0 && modifierFlags & CPControlKeyMask);
 
-        if (sourceElement.tagName === "INPUT" && sourceElement != _DOMFocusElement)
+        if ((sourceElement.tagName === "INPUT" || sourceElement.tagName === "TEXTAREA") && sourceElement != _DOMFocusElement)
         {
             if ([CPPlatform supportsDragAndDrop])
             {

AppKit/Themes/Aristo/ThemeDescriptors.j

@@ -1258,6 +1258,19 @@ var themedButtonValues = nil,
             ["textfield-bezel-square-disabled-8.png", 6.0, 6.0]
         ]),
 
+        bezelFocusedColor = PatternColor(
+        [
+            ["textfield-bezel-square-focused-0.png", 6.0, 6.0],
+            ["textfield-bezel-square-focused-1.png", 1.0, 6.0],
+            ["textfield-bezel-square-focused-2.png", 6.0, 6.0],
+            ["textfield-bezel-square-focused-3.png", 6.0, 1.0],
+            ["textfield-bezel-square-focused-4.png", 1.0, 1.0],
+            ["textfield-bezel-square-focused-5.png", 6.0, 1.0],
+            ["textfield-bezel-square-focused-6.png", 6.0, 6.0],
+            ["textfield-bezel-square-focused-7.png", 1.0, 6.0],
+            ["textfield-bezel-square-focused-8.png", 6.0, 6.0]
+        ]),
+
         bezelColorDatePickerTextField = PatternColor(
             [
                 [@"datepicker-date-segment-0.png", 4.0, 18.0],
@@ -1268,6 +1281,7 @@ var themedButtonValues = nil,
         themeValues =
         [
             [@"bezel-color",        bezelColor,                                                 CPThemeStateBezeled],
+            [@"bezel-color",        bezelFocusedColor,                                          [CPThemeStateBezeled, CPThemeStateEditing]],
             [@"bezel-color",        bezelDisabledColor,                                         [CPThemeStateBezeled, CPThemeStateDisabled]],
 
             [@"font",               [CPFont boldSystemFontOfSize:13.0]],
@@ -1275,8 +1289,10 @@ var themedButtonValues = nil,
 
             [@"content-inset",      CGInsetMake(6.0, 0.0, 0.0, 3.0),                            CPThemeStateNormal],
             [@"content-inset",      CGInsetMake(6.0, 0.0, 0.0, 5.0),                            CPThemeStateBezeled],
+            [@"content-inset",      CGInsetMake(6.0, 0.0, 0.0, 5.0),                            [CPThemeStateBezeled, CPThemeStateEditing]],
 
             [@"bezel-inset",        CGInsetMake(0.0, -3.0, 0.0, -3.0),                          CPThemeStateBezeled],
+            [@"bezel-inset",        CGInsetMake(0.0, -3.0, 0.0, -3.0),                          [CPThemeStateBezeled, CPThemeStateEditing]],
 
             [@"datepicker-textfield-bezel-color", [CPColor clearColor],                         CPThemeStateNormal],
             [@"datepicker-textfield-bezel-color", bezelColorDatePickerTextField,                CPThemeStateSelected],
@@ -1301,10 +1317,12 @@ var themedButtonValues = nil,
             // CPThemeStateControlSizeSmall
             [@"content-inset",              CGInsetMake(5.0, 0.0, 0.0, 5.0),                    [CPThemeStateControlSizeSmall, CPThemeStateNormal]],
             [@"content-inset",              CGInsetMake(5.0, 0.0, 0.0, 5.0),                    [CPThemeStateControlSizeSmall, CPThemeStateBezeled]],
+            [@"content-inset",              CGInsetMake(5.0, 0.0, 0.0, 5.0),                    [CPThemeStateControlSizeSmall, CPThemeStateEditing, CPThemeStateBezeled]],
 
             [@"min-size-datepicker-textfield", CGSizeMake(6.0, 16.0),                           CPThemeStateControlSizeSmall],
             [@"date-hour-margin",           5.0,                                                CPThemeStateControlSizeSmall],
             [@"stepper-margin",             3.0,                                                CPThemeStateControlSizeSmall],
+            [@"stepper-margin",             3.0,                                                [CPThemeStateControlSizeSmall, CPThemeStateEditing]],
 
             [@"min-size",                   CGSizeMake(0, 26.0),                                CPThemeStateControlSizeSmall],
             [@"max-size",                   CGSizeMake(-1.0, 26.0),                             CPThemeStateControlSizeSmall],
@@ -1313,10 +1331,12 @@ var themedButtonValues = nil,
             // CPThemeStateControlSizeMini
             [@"content-inset",              CGInsetMake(4.0, 0.0, 0.0, 4.0),                    [CPThemeStateControlSizeMini, CPThemeStateNormal]],
             [@"content-inset",              CGInsetMake(4.0, 0.0, 0.0, 4.0),                    [CPThemeStateControlSizeMini, CPThemeStateBezeled]],
+            [@"content-inset",              CGInsetMake(4.0, 0.0, 0.0, 4.0),                    [CPThemeStateControlSizeMini, CPThemeStateEditing, CPThemeStateBezeled]],
 
             [@"min-size-datepicker-textfield", CGSizeMake(6.0, 12.0),                           CPThemeStateControlSizeMini],
             [@"date-hour-margin",           2.0,                                                CPThemeStateControlSizeMini],
             [@"stepper-margin",             2.0,                                                CPThemeStateControlSizeMini],
+            [@"stepper-margin",             2.0,                                                [CPThemeStateControlSizeMini, CPThemeStateEditing]],
 
             [@"min-size",                   CGSizeMake(0, 22.0),                                CPThemeStateControlSizeMini],
             [@"max-size",                   CGSizeMake(-1.0, 22.0),                             CPThemeStateControlSizeMini],
@@ -1820,8 +1840,8 @@ var themedButtonValues = nil,
 
             // The right border inset has to make room for the focus ring and popup button
             [@"content-inset",              CGInsetMake(8.0, 27.0, 7.0, 8.0),           [CPThemeStateBezeled, CPComboBoxStateButtonBordered]],
-            [@"content-inset",              CGInsetMake(8.0, 24.0, 7.0, 8.0),           CPThemeStateBezeled],
-            [@"content-inset",              CGInsetMake(8.0, 24.0, 7.0, 8.0),           [CPThemeStateBezeled, CPThemeStateEditing]],
+            [@"content-inset",              CGInsetMake(8.0, 27.0, 7.0, 8.0),           CPThemeStateBezeled],
+            [@"content-inset",              CGInsetMake(8.0, 27.0, 7.0, 8.0),           [CPThemeStateBezeled, CPThemeStateEditing]],
 
             [@"popup-button-size",          CGSizeMake(21.0, 23.0),                     [CPThemeStateBezeled, CPComboBoxStateButtonBordered]],
             [@"popup-button-size",          CGSizeMake(17.0, 23.0),                     CPThemeStateBezeled],

AppKit/Themes/Aristo2/ThemeDescriptors.j

@@ -374,7 +374,7 @@ var themedButtonValues = nil,
             [@"font",                       [CPFont boldSystemFontOfSize:11.0]],
 
             [@"min-size",                   CGSizeMake(32.0, 20.0),                 CPThemeStateControlSizeSmall],
-            [@"max-size",                   CGSizeMake(1.0, 20.0),                  CPThemeStateControlSizeSmall],
+            [@"max-size",                   CGSizeMake(-1.0, 20.0),                 CPThemeStateControlSizeSmall],
             [@"nib2cib-adjustment-frame",   CGRectMake(3.0, 4.0, -6.0, 0.0),        CPThemeStateControlSizeSmall],
 
             // CPThemeStateControlSizeMini
@@ -386,7 +386,7 @@ var themedButtonValues = nil,
 
             [@"min-size",                   CGSizeMake(32.0, 16.0),                 CPThemeStateControlSizeMini],
             [@"max-size",                   CGSizeMake(-1.0, 16.0),                 CPThemeStateControlSizeMini],
-            [@"nib2cib-adjustment-frame",   CGRectMake(1.0, 10.0, -3.0, 0.0),        CPThemeStateControlSizeMini]
+            [@"nib2cib-adjustment-frame",   CGRectMake(1.0, 10.0, -3.0, 0.0),       CPThemeStateControlSizeMini]
         ];
 
     [self registerThemeValues:themeValues forView:button];
@@ -824,6 +824,14 @@ var themedButtonValues = nil,
                 height: 4.0
             }),
 
+        bezelFocusedColor = PatternColor(
+            "textfield-bezel-square-focused{position}.png",
+            {
+                positions: "#",
+                width: 9.0,
+                height: 9.0
+            }),
+
         bezelColorDatePickerTextField = PatternColor(
             [
                 [@"datepicker-date-segment-0.png", 4.0, 18.0],
@@ -835,14 +843,17 @@ var themedButtonValues = nil,
         [
             [@"bezel-color",        bezelColor["@"],                                            CPThemeStateBezeled],
             [@"bezel-color",        bezelColor["disabled"],                                     [CPThemeStateBezeled, CPThemeStateDisabled]],
+            [@"bezel-color",        bezelFocusedColor,                                          [CPThemeStateBezeled, CPThemeStateEditing]],
 
             [@"font",               [CPFont systemFontOfSize:CPFontCurrentSystemSize]],
             [@"text-color",         [CPColor colorWithWhite:0.2 alpha:0.5],                     CPThemeStateDisabled],
 
             [@"content-inset",      CGInsetMake(6.0, 0.0, 0.0, 3.0),                            CPThemeStateNormal],
             [@"content-inset",      CGInsetMake(3.0, 0.0, 0.0, 3.0),                            CPThemeStateBezeled],
+            [@"content-inset",      CGInsetMake(6.0, 0.0, 0.0, 6.0),                            [CPThemeStateNormal, CPThemeStateBezeled, CPThemeStateEditing]],
 
             [@"bezel-inset",        CGInsetMake(3.0, 0.0, 3.0, 0.0),                            CPThemeStateBezeled],
+            [@"bezel-inset",        CGInsetMake(0.0, 0, 0.0, -3.0),                             [CPThemeStateNormal, CPThemeStateBezeled, CPThemeStateEditing]],
 
             [@"datepicker-textfield-bezel-color", [CPColor clearColor],                         CPThemeStateNormal],
             [@"datepicker-textfield-bezel-color", bezelColorDatePickerTextField,                CPThemeStateSelected],
@@ -859,6 +870,7 @@ var themedButtonValues = nil,
             [@"min-size-datepicker-textfield", CGSizeMake(6.0, 18.0)],
             [@"date-hour-margin",   7.0],
             [@"stepper-margin",     5.0],
+            [@"stepper-margin",     2.0,    CPThemeStateEditing],
 
             [@"min-size",                   CGSizeMake(0, 29.0)],
             [@"max-size",                   CGSizeMake(-1.0, 29.0)],
@@ -867,10 +879,12 @@ var themedButtonValues = nil,
             // CPThemeStateControlSizeSmall
             [@"content-inset",              CGInsetMake(5.0, 0.0, 0.0, 3.0),                    [CPThemeStateControlSizeSmall, CPThemeStateNormal]],
             [@"content-inset",              CGInsetMake(2.0, 0.0, 0.0, 3.0),                    [CPThemeStateControlSizeSmall, CPThemeStateBezeled]],
+            [@"content-inset",              CGInsetMake(5.0, 0.0, 0.0, 6.0),                    [CPThemeStateControlSizeSmall, CPThemeStateBezeled, CPThemeStateEditing]],
 
             [@"min-size-datepicker-textfield", CGSizeMake(6.0, 16.0),                           CPThemeStateControlSizeSmall],
             [@"date-hour-margin",           5.0,                                                CPThemeStateControlSizeSmall],
             [@"stepper-margin",             3.0,                                                CPThemeStateControlSizeSmall],
+            [@"stepper-margin",             0.0,                                                [CPThemeStateControlSizeSmall, CPThemeStateEditing]],
 
             [@"min-size",                   CGSizeMake(0, 26.0),                                CPThemeStateControlSizeSmall],
             [@"max-size",                   CGSizeMake(-1.0, 26.0),                             CPThemeStateControlSizeSmall],
@@ -879,10 +893,12 @@ var themedButtonValues = nil,
             // CPThemeStateControlSizeMini
             [@"content-inset",              CGInsetMake(3.0, 0.0, 0.0, 3.0),                    [CPThemeStateControlSizeMini, CPThemeStateNormal]],
             [@"content-inset",              CGInsetMake(1.0, 0.0, 0.0, 3.0),                    [CPThemeStateControlSizeMini, CPThemeStateBezeled]],
+            [@"content-inset",              CGInsetMake(4.0, 0.0, 0.0, 6.0),                    [CPThemeStateControlSizeMini, CPThemeStateBezeled, CPThemeStateEditing]],
 
             [@"min-size-datepicker-textfield", CGSizeMake(6.0, 12.0),                           CPThemeStateControlSizeMini],
             [@"date-hour-margin",           2.0,                                                CPThemeStateControlSizeMini],
             [@"stepper-margin",             2.0,                                                CPThemeStateControlSizeMini],
+            [@"stepper-margin",             -1.0,                                               [CPThemeStateControlSizeMini, CPThemeStateEditing]],
 
             [@"min-size",                   CGSizeMake(0, 22.0),                                CPThemeStateControlSizeMini],
             [@"max-size",                   CGSizeMake(-1.0, 22.0),                             CPThemeStateControlSizeMini],
@@ -1312,9 +1328,9 @@ var themedButtonValues = nil,
             [@"bezel-inset",        CGInsetMake(3.0, 5.0, 3.0, 4.0),            [CPThemeStateBezeled, CPThemeStateDisabled]],
 
             // The right border inset has to make room for the focus ring and popup button
-            [@"content-inset",      CGInsetMake(9.0, 26.0, 7.0, 10.0),          [CPThemeStateBezeled, CPComboBoxStateButtonBordered]],
-            [@"content-inset",      CGInsetMake(9.0, 26.0, 7.0, 10.0),          CPThemeStateBezeled],
-            [@"content-inset",      CGInsetMake(9.0, 24.0, 7.0, 10.0),          [CPThemeStateBezeled, CPThemeStateEditing]],
+            [@"content-inset",      CGInsetMake(9.0, 30.0, 7.0, 10.0),          [CPThemeStateBezeled, CPComboBoxStateButtonBordered]],
+            [@"content-inset",      CGInsetMake(9.0, 30.0, 7.0, 10.0),          CPThemeStateBezeled],
+            [@"content-inset",      CGInsetMake(9.0, 28.0, 7.0, 10.0),          [CPThemeStateBezeled, CPThemeStateEditing]],
 
             [@"popup-button-size",  CGSizeMake(21.0, 23.0),                     [CPThemeStateBezeled, CPComboBoxStateButtonBordered]],
             [@"popup-button-size",  CGSizeMake(17.0, 23.0),                     CPThemeStateBezeled],

AppKit/_CPImageAndTextView.j

@@ -71,7 +71,7 @@ var _CPimageAndTextViewFrameSizeChangedFlag         = 1 << 0,
 
 #if PLATFORM(DOM)
     DOMElement              _DOMImageElement;
-    DOMELement              _DOMTextElement;
+    DOMElement              _DOMTextElement;
     DOMElement              _DOMTextShadowElement;
 #endif
 }

AppKit/_CPPopUpList.j

@@ -65,6 +65,113 @@ var ListMinimumItems = 3;
 var ListColumnIdentifier = @"1";
 
 
+@implementation _CPPopUpPanel : CPPanel
+
+- (id)initWithContentRect:(CGRect)aContentRect styleMask:(unsigned)aStyleMask
+{
+    if (self = [super initWithContentRect:aContentRect styleMask:aStyleMask])
+        _constrainsToUsableScreen = NO;
+
+    [self _trapNextMouseDown];
+
+    return self;
+}
+
+/*!
+    Returns \c YES if the receiver is able to receive input events
+    even when a modal session is active.
+*/
+- (BOOL)worksWhenModal
+{
+    return YES;
+}
+
+- (void)sendEvent:(CPEvent)anEvent
+{
+    var type = [anEvent type];
+
+    if (type === CPLeftMouseDown || type === CPRightMouseDown)
+        [[self delegate] setListWasClicked:YES];
+
+    return [super sendEvent:anEvent];
+}
+
+- (void)orderFront:(id)sender
+{
+    [self _trapNextMouseDown];
+    [super orderFront:sender];
+}
+
+- (void)_mouseWasClicked:(CPEvent)anEvent
+{
+    var mouseWindow = [anEvent window],
+        rect = [[[self delegate] dataSource] bounds],
+        point = [[[self delegate] dataSource] convertPoint:[anEvent locationInWindow] fromView:nil];
+
+    if (mouseWindow != self && !CGRectContainsPoint(rect, point))
+        [[self delegate] close];
+    else
+        [self _trapNextMouseDown];
+}
+
+- (void)_trapNextMouseDown
+{
+    // Don't dequeue the event so clicks in controls will work
+    [CPApp setTarget:self selector:@selector(_mouseWasClicked:) forNextEventMatchingMask:CPLeftMouseDownMask untilDate:nil inMode:CPDefaultRunLoopMode dequeue:NO];
+}
+
+@end
+
+@implementation _CPPopUpTableView : CPTableView
+{
+    BOOL _acceptFirstResponder;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    if (self = [super initWithFrame:aFrame])
+    {
+        // We want the autocomplete to remain first responder until we are clicked.
+        _acceptFirstResponder = NO;
+    }
+
+    return self;
+}
+
+- (void)trackMouse:(CPEvent)anEvent
+{
+    if (![self isEnabled])
+        return;
+
+    [[self delegate] setItemWasClicked:YES];
+
+    // CPTableView will not track the click if it is not first responder
+    _acceptFirstResponder = YES;
+    [[self window] makeFirstResponder:self];
+    [super trackMouse:anEvent];
+}
+
+- (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
+{
+    _acceptFirstResponder = NO;
+    [super stopTracking:lastPoint at:aPoint mouseIsUp:mouseIsUp];
+}
+
+- (BOOL)acceptsFirstResponder
+{
+    return _acceptFirstResponder;
+}
+
+/*!
+    Return the column used for the list.
+*/
+- (CPTableColumn)listColumn
+{
+    return _tableColumns[0];
+}
+
+@end
+
 /*!
     This class is a controller for a panel that can pop up and display a scrollable list of items in a CPTableView.
     It is used by CPComboBox to display the list of choices.
@@ -229,7 +336,7 @@ var ListColumnIdentifier = @"1";
 
     [self listWillPopUp];
 
-    [_panel orderFront:nil];
+    [[aView window] addChildWindow:_panel ordered:CPWindowAbove];
 }
 
 #pragma mark Setting Display Attributes
@@ -800,110 +907,3 @@ var _CPPopUpListDataSourceKey   = @"_CPPopUpListDataSourceKey",
 }
 
 @end
-
-@implementation _CPPopUpTableView : CPTableView
-{
-    BOOL _acceptFirstResponder;
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    if (self = [super initWithFrame:aFrame])
-    {
-        // We want the autocomplete to remain first responder until we are clicked.
-        _acceptFirstResponder = NO;
-    }
-
-    return self;
-}
-
-- (void)trackMouse:(CPEvent)anEvent
-{
-    if (![self isEnabled])
-        return;
-
-    [[self delegate] setItemWasClicked:YES];
-
-    // CPTableView will not track the click if it is not first responder
-    _acceptFirstResponder = YES;
-    [[self window] makeFirstResponder:self];
-    [super trackMouse:anEvent];
-}
-
-- (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
-{
-    _acceptFirstResponder = NO;
-    [super stopTracking:lastPoint at:aPoint mouseIsUp:mouseIsUp];
-}
-
-- (BOOL)acceptsFirstResponder
-{
-    return _acceptFirstResponder;
-}
-
-/*!
-    Return the column used for the list.
-*/
-- (CPTableColumn)listColumn
-{
-    return _tableColumns[0];
-}
-
-@end
-
-@implementation _CPPopUpPanel : CPPanel
-
-- (id)initWithContentRect:(CGRect)aContentRect styleMask:(unsigned)aStyleMask
-{
-    if (self = [super initWithContentRect:aContentRect styleMask:aStyleMask])
-        _constrainsToUsableScreen = NO;
-
-    [self _trapNextMouseDown];
-
-    return self;
-}
-
-/*!
-    Returns \c YES if the receiver is able to receive input events
-    even when a modal session is active.
-*/
-- (BOOL)worksWhenModal
-{
-    return YES;
-}
-
-- (void)sendEvent:(CPEvent)anEvent
-{
-    var type = [anEvent type];
-
-    if (type === CPLeftMouseDown || type === CPRightMouseDown)
-        [[self delegate] setListWasClicked:YES];
-
-    return [super sendEvent:anEvent];
-}
-
-- (void)orderFront:(id)sender
-{
-    [self _trapNextMouseDown];
-    [super orderFront:sender];
-}
-
-- (void)_mouseWasClicked:(CPEvent)anEvent
-{
-    var mouseWindow = [anEvent window],
-        rect = [[[self delegate] dataSource] bounds],
-        point = [[[self delegate] dataSource] convertPoint:[anEvent locationInWindow] fromView:nil];
-
-    if (mouseWindow != self && !CGRectContainsPoint(rect, point))
-        [[self delegate] close];
-    else
-        [self _trapNextMouseDown];
-}
-
-- (void)_trapNextMouseDown
-{
-    // Don't dequeue the event so clicks in controls will work
-    [CPApp setTarget:self selector:@selector(_mouseWasClicked:) forNextEventMatchingMask:CPLeftMouseDownMask untilDate:nil inMode:CPDefaultRunLoopMode dequeue:NO];
-}
-
-@end

AppKit/_CPPopoverWindow.j

@@ -207,7 +207,6 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
             return;
 
         var point = [self computeOriginFromRect:[_targetView bounds] ofView:_targetView preferredEdge:[_windowView preferredEdge]];
-
         [self setFrameOrigin:point];
     }
 }
@@ -362,7 +361,6 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
     [self setFrameOrigin:point];
     [_windowView showCursor];
     [_windowView setNeedsDisplay:YES];
-    [self makeKeyAndOrderFront:nil];
 
     if (positioningView !== _targetView)
     {
@@ -371,6 +369,8 @@ var _CPPopoverWindow_shouldClose_    = 1 << 4,
         _targetView = positioningView;
     }
 
+    [self makeKeyAndOrderFront:nil];
+
     /*
         If _targetView's window is not a full platform window,
         add us as a child, because when we close we are detached from

AppKit/_CPToolbarItem.j

@@ -26,6 +26,7 @@
 @import "CPImage.j"
 @import "CPView.j"
 
+@class CPToolbar
 @global CPApp
 
 CPToolbarItemVisibilityPriorityStandard = 0;

Foundation/CPDateFormatter.j

@@ -28,16 +28,19 @@
 @import "CPLocale.j"
 
 @class CPNull
+@class CPDictionary
 
 @global CPLocaleLanguageCode
 @global CPLocaleCountryCode
 
+@typedef CPDateFormatterStyle
 CPDateFormatterNoStyle     = 0;
 CPDateFormatterShortStyle  = 1;
 CPDateFormatterMediumStyle = 2;
 CPDateFormatterLongStyle   = 3;
 CPDateFormatterFullStyle   = 4;
 
+@typedef CPDateFormatterBehavior
 CPDateFormatterBehaviorDefault = 0;
 CPDateFormatterBehavior10_0    = 1000;
 CPDateFormatterBehavior10_4    = 1040;

Foundation/CPDecimal.j

@@ -52,6 +52,8 @@
 @import "CPArray.j"
 @import "CPNumber.j"
 
+@typedef CPDecimal
+
 // Decimal size limits
 CPDecimalMaxDigits                   =   38;
 CPDecimalMaxExponent                 =  127;
@@ -68,6 +70,7 @@ CPCalculationUnderflow               = 3;
 CPCalculationDivideByZero            = 4;
 
 //CPRoundingMode Enum
+@typedef CPRoundingMode
 CPRoundPlain                         = 1;
 CPRoundDown                          = 2;
 CPRoundUp                            = 3;

Foundation/CPDictionary.j

@@ -31,38 +31,6 @@ var CPDictionaryShowNilDeprecationMessage = YES,
 
     CPDictionaryMaxDescriptionRecursion = 10;
 
-/* @ignore */
-@implementation _CPDictionaryValueEnumerator : CPEnumerator
-{
-    CPEnumerator    _keyEnumerator;
-    CPDictionary    _dictionary;
-}
-
-- (id)initWithDictionary:(CPDictionary)aDictionary
-{
-    self = [super init];
-
-    if (self)
-    {
-        _keyEnumerator = [aDictionary keyEnumerator];
-        _dictionary = aDictionary;
-    }
-
-    return self;
-}
-
-- (id)nextObject
-{
-    var key = [_keyEnumerator nextObject];
-
-    if (key === nil)
-        return nil;
-
-    return [_dictionary objectForKey:key];
-}
-
-@end
-
 /*!
     @class CPDictionary
     @ingroup foundation
@@ -801,6 +769,40 @@ var CPDictionaryShowNilDeprecationMessage = YES,
 
 @end
 
+
+/* @ignore */
+@implementation _CPDictionaryValueEnumerator : CPEnumerator
+{
+    CPEnumerator    _keyEnumerator;
+    CPDictionary    _dictionary;
+}
+
+- (id)initWithDictionary:(CPDictionary)aDictionary
+{
+    self = [super init];
+
+    if (self)
+    {
+        _keyEnumerator = [aDictionary keyEnumerator];
+        _dictionary = aDictionary;
+    }
+
+    return self;
+}
+
+- (id)nextObject
+{
+    var key = [_keyEnumerator nextObject];
+
+    if (key === nil)
+        return nil;
+
+    return [_dictionary objectForKey:key];
+}
+
+@end
+
+
 /*!
     @class CPMutableDictionary
     @ingroup compatibility

Foundation/CPGeometry.j

@@ -22,6 +22,7 @@
 
 @import "_CGGeometry.j"
 
+@typedef CPRectEdge
 CPMinXEdge = 0;
 CPMinYEdge = 1;
 CPMaxXEdge = 2;

Foundation/CPJSONPConnection.j

@@ -23,6 +23,7 @@
 @import "CPException.j"
 @import "CPObject.j"
 @import "CPRunLoop.j"
+@import "CPURLRequest.j"
 
 CPJSONPConnectionCallbacks = {};
 

Foundation/CPNotificationCenter.j

@@ -27,6 +27,8 @@
 @import "CPNull.j"
 @import "CPSet.j"
 
+@class _CPNotificationRegistry
+
 var CPNotificationDefaultCenter = nil;
 
 /*!
@@ -68,7 +70,8 @@ var CPNotificationDefaultCenter = nil;
         _namedRegistries = @{};
         _unnamedRegistry = [[_CPNotificationRegistry alloc] init];
     }
-   return self;
+
+    return self;
 }
 
 /*!
@@ -81,9 +84,36 @@ var CPNotificationDefaultCenter = nil;
 */
 - (void)addObserver:(id)anObserver selector:(SEL)aSelector name:(CPString)aNotificationName object:(id)anObject
 {
-    var registry,
+    var registry = [self _registryForNotificationName:aNotificationName],
         observer = [[_CPNotificationObserver alloc] initWithObserver:anObserver selector:aSelector];
 
+    [registry addObserver:observer object:anObject];
+}
+
+/*!
+    Adds an entry to the receiver’s dispatch table with a block, and optional criteria: notification name and sender.
+    @param aNotificationName the name of the notification the observer wants to watch
+    @param anObject the object in the notification the observer wants to watch
+    @param queue is ignored for the moment
+    @param block the block to be executed when the notification is received.
+*/
+- (id <CPObject>)addObserverForName:(CPString)aNotificationName object:(id)anObject queue:(id)queue usingBlock:(Function)block
+{
+    var registry = [self _registryForNotificationName:aNotificationName],
+        observer = [[_CPNotificationObserver alloc] initWithBlock:block];
+
+    [registry addObserver:observer object:anObject];
+
+    return observer;
+}
+
+/*!
+    @ignore
+*/
+- (_CPNotificationRegistry)_registryForNotificationName:(CPString)aNotificationName
+{
+    var registry;
+
     if (aNotificationName == nil)
         registry = _unnamedRegistry;
     else if (!(registry = [_namedRegistries objectForKey:aNotificationName]))
@@ -92,7 +122,7 @@ var CPNotificationDefaultCenter = nil;
         [_namedRegistries setObject:registry forKey:aNotificationName];
     }
 
-    [registry addObserver:observer object:anObject];
+    return registry;
 }
 
 /*!
@@ -233,7 +263,8 @@ var _CPNotificationCenterPostNotification = function(/* CPNotificationCenter */
                 observersEnumerator = [observers objectEnumerator];
 
             while ((observer = [observersEnumerator nextObject]) !== nil)
-                if ([observer observer] == anObserver)
+                if ([observer observer] == anObserver ||
+                    ([observer block] && [anObserver respondsToSelector:@selector(block)] && [observer block] == [anObserver block]))
                     [observers removeObject:observer];
 
             if (![observers count])
@@ -248,7 +279,8 @@ var _CPNotificationCenterPostNotification = function(/* CPNotificationCenter */
             observersEnumerator = [observers objectEnumerator];
 
         while ((observer = [observersEnumerator nextObject]) !== nil)
-            if ([observer observer] == anObserver)
+            if ([observer observer] == anObserver ||
+                ([observer block] && [anObserver respondsToSelector:@selector(block)] && [observer block] == [anObserver block]))
                 [observers removeObject:observer];
 
         if (![observers count])
@@ -312,8 +344,9 @@ var _CPNotificationCenterPostNotification = function(/* CPNotificationCenter */
 /* @ignore */
 @implementation _CPNotificationObserver : CPObject
 {
-    id  _observer;
-    SEL _selector;
+    id          _observer;
+    Function    _block;
+    SEL         _selector;
 }
 
 - (id)initWithObserver:(id)anObserver selector:(SEL)aSelector
@@ -327,13 +360,34 @@ var _CPNotificationCenterPostNotification = function(/* CPNotificationCenter */
    return self;
 }
 
+- (id)initWithBlock:(Function)aBlock
+{
+    if (self)
+    {
+        _block = aBlock;
+    }
+
+    return self;
+}
+
 - (id)observer
 {
     return _observer;
 }
 
+- (id)block
+{
+    return _block;
+}
+
 - (void)postNotification:(CPNotification)aNotification
 {
+    if (_block)
+    {
+        _block(aNotification);
+        return;
+    }
+
     [_observer performSelector:_selector withObject:aNotification];
 }
 

Foundation/CPNumberFormatter.j

@@ -24,7 +24,7 @@
 @import "CPFormatter.j"
 @import "CPDecimalNumber.j"
 
-
+@typedef CPNumberFormatterStyle
 CPNumberFormatterNoStyle            = 0;
 CPNumberFormatterDecimalStyle       = 1;
 CPNumberFormatterCurrencyStyle      = 2;
@@ -32,6 +32,7 @@ CPNumberFormatterPercentStyle       = 3;
 CPNumberFormatterScientificStyle    = 4;
 CPNumberFormatterSpellOutStyle      = 5;
 
+@typedef CPNumberFormatterRoundingMode
 CPNumberFormatterRoundCeiling       = CPRoundUp;
 CPNumberFormatterRoundFloor         = CPRoundDown;
 CPNumberFormatterRoundDown          = CPRoundDown;

Foundation/CPObject.j

@@ -62,6 +62,8 @@ CPLog(@"Got some class: %@", inst);
     @todo document KVC usage.
 */
 
+@import "_CPTypeDefinitions.j"
+
 @class CPString
 @class CPException
 
@@ -104,7 +106,7 @@ CPLog(@"Got some class: %@", inst);
 
 @implementation CPObject <CPObject>
 {
-    Class   isa;
+    id   isa;
 }
 
 + (void)load

Foundation/CPPredicate/CPComparisonPredicate.j

@@ -32,8 +32,8 @@
 @import "_CPPredicate.j"
 
 
-var CPComparisonPredicateModifier,
-    CPPredicateOperatorType;
+@typedef CPComparisonPredicateModifier
+@typedef CPPredicateOperatorType
 
 /*!
     @ingroup foundation

Foundation/CPPredicate/CPCompoundPredicate.j

@@ -26,7 +26,7 @@
 @import "CPArray.j"
 @import "_CPPredicate.j"
 
-var CPCompoundPredicateType;
+@typedef CPCompoundPredicateType
 
 /*!
     @class CPCompoundPredicate

Foundation/CPRange.j

@@ -25,6 +25,8 @@
     @{
 */
 
+@typedef CPRange
+
 /*!
     Makes a CPRange.
     @param location the location for new range

Foundation/CPTimeZone.j

@@ -24,6 +24,8 @@
 @import "CPDate.j"
 @import "CPLocale.j"
 
+@class CPData
+
 CPTimeZoneNameStyleStandard = 0;
 CPTimeZoneNameStyleShortStandard = 1;
 CPTimeZoneNameStyleDaylightSaving = 2;

Foundation/CPURLConnection.j

@@ -26,6 +26,8 @@
 @import "CPURLRequest.j"
 @import "CPURLResponse.j"
 
+@typedef HTTPRequest
+
 var CPURLConnectionDelegate = nil;
 
 /*!

Foundation/CPUndoManager.j

@@ -50,7 +50,7 @@ var _CPUndoGroupingPool         = [],
 /* @ignore */
 @implementation _CPUndoGrouping : CPObject
 {
-    _CPUndoGrouping _parent;
+    id              _parent;
     CPMutableArray  _invocations;
     CPString        _actionName;
 }

Foundation/CPUserSessionManager.j

@@ -24,6 +24,7 @@
 @import "CPObject.j"
 @import "CPString.j"
 
+@typedef CPUserSessionStatus
 CPUserSessionUndeterminedStatus = 0;
 CPUserSessionLoggedInStatus     = 1;
 CPUserSessionLoggedOutStatus    = 2;

Foundation/_CGGeometry.j

@@ -26,6 +26,12 @@ CGGeometry is not a part of Foundation. The reason _CGGeometry.j exists, and is
 
 */
 
+@typedef CGPoint
+@typedef CGSize
+@typedef CGRect
+@typedef CGInset
+
+
 function CGPointMake(x, y)
 {
     return { x:x, y:y };

Foundation/_CPTypeDefinitions.j

@@ -0,0 +1,30 @@
+/*
+ * _CPTypeDefintions.j
+ * Foundation
+ *
+ * Created by Antoine Mercadal.
+ * Copyright 2014, Antoine Mercadal.
+ *
+ * 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
+ */
+
+@typedef Class
+@typedef CPInteger
+@typedef CPUInteger
+@typedef DOMElement
+@typedef JSObject
+@typedef CPMethodSignature
+@typedef CPPropertyListFormat
+@typedef CPTimeInterval

Objective-J/CommonJS/lib/objective-j.js

@@ -68,6 +68,8 @@ with (window)
 // runs the objj repl or file provided in args
 exports.run = function(args)
 {
+    var multipleFiles = false;
+
     if (args)
     {
         // we expect args to be in the format:
@@ -79,27 +81,82 @@ exports.run = function(args)
         // copy the args since we're going to modify them
         var argv = args.slice(1);
 
-        if (argv[0] === "--version")
+        if (argv[0] === "--version" || argv[0] === "-v")
         {
             print(exports.fullVersionString());
             return;
         }
 
-        while (argv.length && argv[0].indexOf('-I') === 0)
-            OBJJ_INCLUDE_PATHS.unshift.apply(OBJJ_INCLUDE_PATHS, argv.shift().substr(2).split(':'));
+        if (argv[0] === "--help" || argv[0] === "-h")
+        {
+            print("Usage (objj): " + args[0] + " [options] [--] files...");
+            print("  -v, --version                  print the current version of objj");
+            print("  -I, --objj-include-paths       include a specific framework paths")
+            print("  -h, --help                     print this help");
+            print("  -m, --multifiles               launch objj on several files")
+            return;
+        }
+
+        while (argv.length && argv[0].indexOf('-') === 0)
+        {
+            switch (argv[0])
+            {
+                case "-I":
+                    argv.shift();
+                    OBJJ_INCLUDE_PATHS.unshift.apply(OBJJ_INCLUDE_PATHS, argv.shift().split(":"));
+                    break;
+
+                case "-m":
+                    argv.shift();
+                    multipleFiles = true;
+                    break
+            }
+        }
     }
 
     if (argv && argv.length > 0)
     {
-        var arg0 = argv.shift();
-        var mainFilePath = FILE.canonical(arg0);
+        var endCommand = false;
 
-        exports.make_narwhal_factory(mainFilePath)(require, { }, module, system, print);
+        while (argv.length > 0)
+        {
+            var arg0 = argv.shift();
+            var mainFilePath = FILE.canonical(arg0);
 
-        if (typeof main === "function")
-            main([arg0].concat(argv));
+            if (multipleFiles)
+            {
+                // This is needed to process every files passed in args
+                // Otherwise it would stop when an error is raised or we would like to objj the other given files
+                try
+                {
+                    exports.make_narwhal_factory(mainFilePath)(require, { }, module, system, print);
+                }
+                catch(e)
+                {
+                    print("\n" + e);
+                }
+            }
+            else
+            {
+                exports.make_narwhal_factory(mainFilePath)(require, { }, module, system, print);
+            }
 
-        require("browser/timeout").serviceTimeouts();
+            if (typeof main === "function")
+            {
+                main([arg0].concat(argv));
+                endCommand = true;
+            }
+
+            require("browser/timeout").serviceTimeouts();
+
+            if (!multipleFiles || endCommand)
+                break;
+
+            ObjectiveJ.Executable.resetCachedFileExecutableSearchers();
+            ObjectiveJ.StaticResource.resetRootResources();
+            ObjectiveJ.FileExecutable.resetFileExecutables();
+            objj_resetRegisterClasses();
+        }
     }
     else
     {

Objective-J/CommonJS/lib/objective-j/jake/bundletask.js

@@ -35,7 +35,12 @@ function BundleTask(aName, anApplication)
 {
     Task.apply(this, arguments);
 
-    this.setEnvironments([environment.Browser, environment.CommonJS]);
+    var ignoreCommonJS = system.env["CAPP_IGNORE_COMMONJS_ENV"];
+
+    if (ignoreCommonJS && ignoreCommonJS.toLowerCase() == "no" || ignoreCommonJS == "1")
+        this.setEnvironments([environment.Browser]);
+    else
+        this.setEnvironments([environment.Browser, environment.CommonJS]);
 
     this._author = null;
     this._email = null;

Objective-J/ObjJAcornCompiler.js

@@ -353,6 +353,11 @@ ProtocolDef.prototype.getClassMethod = function(name) {
     return null;
 }
 
+var TypeDef = function(name)
+{
+    this.name = name;
+}
+
 // methodDef = {"types": types, "name": selector}
 var MethodDef = function(name, types)
 {
@@ -369,7 +374,7 @@ var wordPrefixOperators = exports.acorn.makePredicate("delete in instanceof new
 var isLogicalBinary = exports.acorn.makePredicate("LogicalExpression BinaryExpression");
 var isInInstanceof = exports.acorn.makePredicate("in instanceof");
 
-var ObjJAcornCompiler = function(/*String*/ aString, /*CFURL*/ aURL, /*unsigned*/ flags, /*unsigned*/ pass, /* Dictionary */ classDefs, /* Dictionary */ protocolDefs)
+var ObjJAcornCompiler = function(/*String*/ aString, /*CFURL*/ aURL, /*unsigned*/ flags, /*unsigned*/ pass, /* Dictionary */ classDefs, /* Dictionary */ protocolDefs, /* Dictionary */ typeDefs)
 {
     this.source = aString;
     this.URL = new CFURL(aURL);
@@ -399,6 +404,7 @@ var ObjJAcornCompiler = function(/*String*/ aString, /*CFURL*/ aURL, /*unsigned*
     this.flags = flags | ObjJAcornCompiler.Flags.IncludeDebugSymbols;
     this.classDefs = classDefs ? classDefs : Object.create(null);
     this.protocolDefs = protocolDefs ? protocolDefs : Object.create(null);
+    this.typeDefs = typeDefs ? typeDefs : Object.create(null);
     this.lastPos = 0;
     if (currentCompilerFlags & ObjJAcornCompiler.Flags.Generate)
         this.generate = true;
@@ -415,9 +421,9 @@ exports.ObjJAcornCompiler.compileToExecutable = function(/*String*/ aString, /*C
     return new ObjJAcornCompiler(aString, aURL, flags, 2).executable();
 }
 
-exports.ObjJAcornCompiler.compileToIMBuffer = function(/*String*/ aString, /*CFURL*/ aURL, /*unsigned*/ flags, classDefs, protocolDefs)
+exports.ObjJAcornCompiler.compileToIMBuffer = function(/*String*/ aString, /*CFURL*/ aURL, /*unsigned*/ flags, classDefs, protocolDefs, typeDefs)
 {
-    return new ObjJAcornCompiler(aString, aURL, flags, 2, classDefs, protocolDefs).IMBuffer();
+    return new ObjJAcornCompiler(aString, aURL, flags, 2, classDefs, protocolDefs, typeDefs).IMBuffer();
 }
 
 exports.ObjJAcornCompiler.compileFileDependencies = function(/*String*/ aString, /*CFURL*/ aURL, /*unsigned*/ flags)
@@ -581,6 +587,31 @@ ObjJAcornCompiler.prototype.getProtocolDef = function(/* String */ aProtocolName
 //  protocolDef = {"name": protocolName, "protocols": Object.create(null), "required": Object.create(null), "optional": Object.create(null)};
 }
 
+ObjJAcornCompiler.prototype.getTypeDef = function(/* String */ aTypeDefName)
+{
+    if (!aTypeDefName)
+        return null;
+
+    var t = this.typeDefs[aTypeDefName];
+
+    if (t)
+        return t;
+
+    if (typeof objj_getTypeDef === 'function')
+    {
+        var aTypeDef = objj_getTypeDef(aTypeDefName);
+        if (aTypeDef)
+        {
+            var typeDefName = typeDef_getName(aTypeDef)
+            t = new TypeDef(typeDefName);
+            this.typeDefs[typeDefName] = t;
+            return t;
+        }
+    }
+
+    return null;
+}
+
 ObjJAcornCompiler.methodDefsFromMethodList = function(/* Array */ methodList)
 {
     var methodSize = methodList.length,
@@ -1643,6 +1674,9 @@ ClassDeclarationStatement: function(node, st, c) {
     compiler.cmBuffer = new StringBuffer();
     compiler.classBodyBuffer = new StringBuffer();      // TODO: Check if this is needed
 
+    if (compiler.getTypeDef(className))
+        throw compiler.error_message(className + " is already declared as a type", node.classname);
+
     if (!generate) saveJSBuffer.concat(compiler.source.substring(compiler.lastPos, node.start));
 
     // First we declare the class
@@ -1715,12 +1749,19 @@ ClassDeclarationStatement: function(node, st, c) {
         {
             var ivarDecl = node.ivardeclarations[i],
                 ivarType = ivarDecl.ivartype ? ivarDecl.ivartype.name : null,
+                ivarTypeIsClass = ivarDecl.ivartype ? ivarDecl.ivartype.typeisclass : false,
                 ivarName = ivarDecl.id.name,
                 ivar = {"type": ivarType, "name": ivarName},
                 accessors = ivarDecl.accessors;
 
             if (ivars[ivarName])
-                throw compiler.error_message("Instance variable '" + ivarName + "'is already declared for class " + className, ivarDecl.id);
+                throw compiler.error_message("Instance variable '" + ivarName + "' is already declared for class " + className, ivarDecl.id);
+
+            var isTypeDefined = !ivarTypeIsClass || typeof global[ivarType] !== "undefined" || typeof window[ivarType] !== "undefined"
+                                || compiler.getClassDef(ivarType) || compiler.getTypeDef(ivarType) || ivarType == classDef.name;
+
+            if (!isTypeDefined)
+                compiler.addWarning(createMessage("Unknown type '" + ivarType + "' for ivar '" + ivarName + "'", ivarDecl.id, compiler.source));
 
             if (firstIvarDeclaration)
             {
@@ -1824,7 +1865,7 @@ ClassDeclarationStatement: function(node, st, c) {
 
         // Remove all @accessors or we will get a recursive loop in infinity
         var b = getterSetterBuffer.toString().replace(/@accessors(\(.*\))?/g, "");
-        var imBuffer = ObjJAcornCompiler.compileToIMBuffer(b, "Accessors", compiler.flags, compiler.classDefs, compiler.protocolDefs);
+        var imBuffer = ObjJAcornCompiler.compileToIMBuffer(b, "Accessors", compiler.flags, compiler.classDefs, compiler.protocolDefs, compiler.typeDefs);
 
         // Add the accessors methods first to instance method buffer.
         // This will allow manually added set and get methods to override the compiler generated
@@ -2371,6 +2412,10 @@ ClassStatement: function(node, st, c) {
         compiler.jsBuffer.concat("//");
     }
     var className = node.id.name;
+
+    if (compiler.getTypeDef(className))
+        throw compiler.error_message(className + " is already declared as a type", node.id);
+
     if (!compiler.getClassDef(className)) {
         classDef = new ClassDef(false, className);
         compiler.classDefs[className] = classDef;
@@ -2393,5 +2438,42 @@ PreprocessStatement: function(node, st, c) {
       compiler.lastPos = node.start;
       compiler.jsBuffer.concat("//");
     }
+},
+TypeDefStatement: function(node, st, c) {
+
+    var compiler = st.compiler,
+        generate = compiler.generate,
+        buffer = compiler.jsBuffer,
+        typeDefName = node.typedefname.name,
+        typeDef = compiler.getTypeDef(typeDefName),
+        typeDefScope = new Scope(st);
+
+    if (typeDef)
+        throw compiler.error_message("Duplicate type definition " + typeDefName, node.typedefname);
+
+    if (compiler.getClassDef(typeDefName))
+        throw compiler.error_message(typeDefName + " is already declared as class", node.typedefname);
+
+    compiler.imBuffer = new StringBuffer();
+    compiler.cmBuffer = new StringBuffer();
+
+    if (!generate)
+        buffer.concat(compiler.source.substring(compiler.lastPos, node.start));
+
+    buffer.concat("{var the_typedef = objj_allocateTypeDef(\"" + typeDefName + "\");");
+
+    typeDef = new TypeDef(typeDefName);
+    compiler.typeDefs[typeDefName] = typeDef;
+    typeDefScope.typeDef = typeDef;
+
+    buffer.concat("\nobjj_registerTypeDef(the_typedef);\n");
+
+    buffer.concat("}");
+
+    compiler.jsBuffer = buffer;
+
+    // Skip the "@end"
+    if (!generate)
+        compiler.lastPos = node.end;
 }
 });

Objective-J/OldBrowserCompatibility.js

@@ -37,7 +37,7 @@ if (!Object.create)
 // This is for IE8 support. It doesn't have the Object.keys function.
 if (!Object.keys)
 {
-    Object.keys = (function ()
+    Object.keys = (function()
     {
         var hasOwnProperty = Object.prototype.hasOwnProperty,
             hasDontEnumBug = !({toString: null}).propertyIsEnumerable('toString'),

Objective-J/Runtime.js

@@ -100,6 +100,11 @@ GLOBAL(objj_object) = function()
     this._UID   = -1;
 }
 
+GLOBAL(objj_typeDef) = function(/*String*/ aName)
+{
+    this.name = aName;
+}
+
 // Working with Classes
 
 GLOBAL(class_getName) = function(/*Class*/ aClass)
@@ -440,6 +445,26 @@ GLOBAL(protocol_addProtocol) = function(/*Protocol*/ proto, /*Protocol*/ additio
     (proto.protocol_list || (proto.protocol_list = [])).push(addition);
 }
 
+
+var REGISTERED_TYPEDEFS = Object.create(null);
+
+GLOBAL(objj_allocateTypeDef) = function(/*String*/ aName)
+{
+    var typeDef = new objj_typeDef(aName);
+
+    return typeDef;
+}
+
+GLOBAL(objj_registerTypeDef) = function(/*TypeDef*/ typeDef)
+{
+    REGISTERED_TYPEDEFS[typeDef.name] = typeDef;
+}
+
+GLOBAL(typeDef_getName) = function(/*TypeDef*/ typeDef)
+{
+    return typeDef.name;
+}
+
 var _class_initialize = function(/*Class*/ aClass)
 {
     var meta = GETMETA(aClass);
@@ -619,6 +644,7 @@ GLOBAL(objj_resetRegisterClasses) = function()
 
     REGISTERED_CLASSES = Object.create(null);
     REGISTERED_PROTOCOLS = Object.create(null);
+    REGISTERED_TYPEDEFS = Object.create(null);
 
     resetBundle();
 }
@@ -751,6 +777,13 @@ GLOBAL(objj_getProtocol) = function(/*String*/ aName)
     return REGISTERED_PROTOCOLS[aName];
 }
 
+// Working with typeDef
+
+GLOBAL(objj_getTypeDef) = function(/*String*/ aName)
+{
+    return REGISTERED_TYPEDEFS[aName];
+}
+
 // Working with Instance Variables
 
 GLOBAL(ivar_getName) = function(anIvar)

Objective-J/acorn.js

@@ -375,12 +375,15 @@ if (typeof exports != "undefined" && !exports.acorn) {
   var _ref = {keyword: "ref"}, _deref = {keyword: "deref"};
   var _protocol = {keyword: "protocol"}, _optional = {keyword: "optional"}, _required = {keyword: "required"};
   var _interface = {keyword: "interface"};
+  var _typedef = {keyword: "typedef"};
 
   // Objective-J keywords
 
   var _filename = {keyword: "filename"}, _unsigned = {keyword: "unsigned", okAsIdent: true}, _signed = {keyword: "signed", okAsIdent: true};
   var _byte = {keyword: "byte", okAsIdent: true}, _char = {keyword: "char", okAsIdent: true}, _short = {keyword: "short", okAsIdent: true};
   var _int = {keyword: "int", okAsIdent: true}, _long = {keyword: "long", okAsIdent: true}, _id = {keyword: "id", okAsIdent: true};
+  var _boolean = {keyword: "BOOL", okAsIdent: true}, _SEL = {keyword: "SEL", okAsIdent: true}, _float = {keyword: "float", okAsIdent: true};
+  var _double = {keyword: "double", okAsIdent: true};
   var _preprocess = {keyword: "#"};
 
   // Preprocessor keywords
@@ -415,14 +418,15 @@ if (typeof exports != "undefined" && !exports.acorn) {
   // Map Objective-J keyword names to token types.
 
   var keywordTypesObjJ = {"IBAction": _action, "IBOutlet": _outlet, "unsigned": _unsigned, "signed": _signed, "byte": _byte, "char": _char,
-                          "short": _short, "int": _int, "long": _long, "id": _id };
+                          "short": _short, "int": _int, "long": _long, "id": _id, "float": _float, "BOOL": _boolean, "SEL": _SEL,
+                          "double": _double};
 
   // Map Objective-J "@" keyword names to token types.
 
   var objJAtKeywordTypes = {"implementation": _implementation, "outlet": _outlet, "accessors": _accessors, "end": _end,
                             "import": _import, "action": _action, "selector": _selector, "class": _class, "global": _global,
                             "ref": _ref, "deref": _deref, "protocol": _protocol, "optional": _optional, "required": _required,
-                            "interface": _interface};
+                            "interface": _interface, "typedef": _typedef};
 
   // Map Preprocessor keyword names to token types.
 
@@ -547,7 +551,7 @@ if (typeof exports != "undefined" && !exports.acorn) {
 
   // The Objective-J keywords.
 
-  var isKeywordObjJ = makePredicate("IBAction IBOutlet byte char short int long unsigned signed id");
+  var isKeywordObjJ = makePredicate("IBAction IBOutlet byte char short int long float unsigned signed id BOOL SEL double");
 
   // The preprocessor keywords.
 
@@ -662,6 +666,7 @@ var preprocessTokens = [_preIf, _preIfdef, _preIfndef, _preElse, _preElseIf, _pr
         }
       }
     }
+
     tokVal = val;
     lastTokCommentsAfter = tokCommentsAfter;
     lastTokSpacesAfter = tokSpacesAfter;
@@ -2277,6 +2282,15 @@ var preIfLevel = 0;
       }
       break;
 
+      // This is a Objective-J statement
+    case _typedef:
+      if (options.objj) {
+        next();
+        node.typedefname = parseIdent(true);
+        return finishNode(node, "TypeDefStatement");
+      }
+      break;
+
     }
 
       // The indentation is one step to the right here to make sure it
@@ -2317,6 +2331,7 @@ var preIfLevel = 0;
       if (outlet)
         decl.outlet = outlet;
       decl.ivartype = type;
+      // print("keyword: " + type.name + " is class " + type.typeisclass)
       decl.id = parseIdent();
       if (strict && isStrictBadIdWord(decl.id.name))
         raise(decl.id.start, "Binding " + decl.id.name + " in strict mode");
@@ -3021,6 +3036,7 @@ var preIfLevel = 0;
       node.typeisclass = true;
       next();
     } else {
+      node.typeisclass = false;
       node.name = tokType.keyword;
       // Do nothing more if it is 'void'
       if (!eat(_void)) {
@@ -3043,32 +3059,36 @@ var preIfLevel = 0;
         } else {
           // Now check if it is some basic type or an approved combination of basic types
           var nextKeyWord;
-          if (eat(_signed) || eat(_unsigned))
-            nextKeyWord = tokType.keyword || true;
-          if (eat(_char) || eat(_byte) || eat(_short)) {
-            if (nextKeyWord)
-              node.name += " " + nextKeyWord;
-            nextKeyWord = tokType.keyword || true;
-          } else {
-            if (eat(_int)) {
-              if (nextKeyWord)
-                node.name += " " + nextKeyWord;
-              nextKeyWord = tokType.keyword || true;
-            }
-            if (eat(_long)) {
-              if (nextKeyWord)
-                node.name += " " + nextKeyWord;
-              nextKeyWord = tokType.keyword || true;
-              if (eat(_long)) {
-                node.name += " " + nextKeyWord;
-              }
-            }
-          }
-          if (!nextKeyWord) {
-            // It must be a class name if it was not a basic type. // FIXME: This is not true
-            node.name = (!options.forbidReserved && tokType.keyword) || unexpected();
-            node.typeisclass = true;
-            next();
+          if (eat(_float) || eat(_boolean) || eat(_SEL) || eat(_double))
+              nextKeyWord = tokType.keyword;
+          else {
+             if (eat(_signed) || eat(_unsigned))
+               nextKeyWord = tokType.keyword || true;
+             if (eat(_char) || eat(_byte) || eat(_short)) {
+               if (nextKeyWord)
+                 node.name += " " + nextKeyWord;
+               nextKeyWord = tokType.keyword || true;
+             } else {
+               if (eat(_int)) {
+                 if (nextKeyWord)
+                   node.name += " " + nextKeyWord;
+                 nextKeyWord = tokType.keyword || true;
+               }
+               if (eat(_long)) {
+                 if (nextKeyWord)
+                   node.name += " " + nextKeyWord;
+                 nextKeyWord = tokType.keyword || true;
+                 if (eat(_long)) {
+                   node.name += " " + nextKeyWord;
+                 }
+               }
+             }
+             if (!nextKeyWord) {
+               // It must be a class name if it was not a basic type. // FIXME: This is not true
+               node.name = (!options.forbidReserved && tokType.keyword) || unexpected();
+               node.typeisclass = true;
+               next();
+             }
           }
         }
       }

Objective-J/acornwalk.js

@@ -221,6 +221,8 @@ if (!exports.acorn) {
     }
   }
 
+  exports.TypeDefStatement = ignore;
+
   exports.MethodDeclarationStatement = function(node, st, c) {
     var body = node.body;
     if (body)

Objective-J/json2.js

@@ -161,7 +161,7 @@
 if (!this.JSON) {
     JSON = {};
 }
-(function () {
+(function() {
 
     function f(n) {
         // Format integers to have at least two digits.

README.markdown

@@ -33,7 +33,7 @@ Getting Started
 ---------------
 To get started, download and install the current release version of Cappuccino:
 
-    $ curl https://raw.github.com/cappuccino/cappuccino/v0.9.7/bootstrap.sh >/tmp/cappuccino_bootstrap.sh && bash /tmp/cappuccino_bootstrap.sh
+    $ curl https://raw.githubusercontent.com/cappuccino/cappuccino/v0.9.7-1/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.
 

Tests/AppKit/CPArrayControllerTest.j

@@ -3,6 +3,9 @@
 @import <AppKit/CPArrayController.j>
 @import <AppKit/CPTextField.j>
 
+@class Department
+@class Employee
+
 @implementation CPArrayControllerTest : OJTestCase
 {
     CPArrayController   _arrayController @accessors(property=arrayController);

Tests/AppKit/CPBrowserTest.j

@@ -1,5 +1,8 @@
 @import <AppKit/AppKit.j>
 
+@class CPBrowserDelegate
+
+
 @implementation CPBrowserTest : OJTestCase
 {
     CPBrowser   browser;

Tests/AppKit/CPKeyValueBindingSimpleBindingsTest.j

@@ -1,6 +1,8 @@
 
 @import <AppKit/AppKit.j>
 
+@class Track
+
 /*!
     Bindings tests exercising the functionality seen in the Cocoa example "SimpleBindingsAdoption".
 */

Tests/AppKit/CPMenuValidatedUserInterfaceItemTest.j

@@ -1,5 +1,7 @@
 var CPMenuValidatedUserInterfaceItemTestValidatedItems = [];
 
+@class MenuTarget
+
 @implementation CPMenuValidatedUserInterfaceItemTest : OJTestCase
 {
     CPMenu                          _menu @accessors(property=menu);
@@ -83,4 +85,4 @@ var CPMenuValidatedUserInterfaceItemTestValidatedItems = [];
 
 }
 
-@end
+@end

Tests/AppKit/CPOutlineViewTest.j

@@ -1,5 +1,8 @@
 @import <AppKit/AppKit.j>
 
+@class TestOutlineDataSource
+
+
 @implementation CPOutlineViewTest : OJTestCase
 {
     CPOutlineView   outlineView;

Tests/AppKit/CPTokenFieldTest.j

@@ -1,5 +1,7 @@
 @import <AppKit/AppKit.j>
 
+@class TestDelegateTokenField
+
 [CPApplication sharedApplication];
 
 @implementation CPTokenFieldTest : OJTestCase

Tests/Foundation/CPKVCArrayTest.j

@@ -1,5 +1,8 @@
 var COUNTER;
 
+@class TestObject
+@class ImplementedTestObject
+
 @implementation CPKVCArrayTest : OJTestCase
 {
     TestObject              _object @accessors(property=object);

Tests/Foundation/CPKVOTest.j

@@ -1,6 +1,9 @@
 @import <Foundation/CPKeyValueCoding.j>
 @import <Foundation/CPKeyValueObserving.j>
 
+@class CarTester
+@class ToManyTester
+
 @implementation CPKVOTest : OJTestCase
 {
     BOOL        _sawInitialObservation;

Tests/Foundation/CPKeyValueCodingTest.j

@@ -22,6 +22,9 @@
 
 @import <Foundation/CPObject.j>
 
+@class Department2
+@class Employee2
+
 var accessIVARS = YES;
 
 @implementation KVCTestClass : CPObject

Tests/Foundation/CPNotificationCenterTest.j

@@ -52,6 +52,51 @@ var TestNotification = @"TestNotification";
     [self assert:8 equals:notificationCount message:@"observer should not be notified"];
 }
 
+- (void)testNotifyWithBlocks
+{
+    var center = [CPNotificationCenter defaultCenter];
+
+    notificationCount = 0;
+
+    var notificationBlock = function(notification){
+        notificationCount += 1;
+    };
+
+    var observer2 = [center addObserverForName:TestNotification object:2 queue:nil usingBlock:notificationBlock],
+        observer25 = [center addObserverForName:TestNotification object:25 queue:nil usingBlock:notificationBlock];
+
+    [center postNotificationName:TestNotification object:self];
+    [self assert:0 equals:notificationCount message:@"observer should only be notified for object '2'"];
+
+    [center postNotificationName:TestNotification object:2];
+    [self assert:1 equals:notificationCount message:@"observer should be notified for object '2'"];
+
+    var observerNil = [center addObserverForName:TestNotification object:nil queue:nil usingBlock:notificationBlock];
+
+    [center postNotificationName:TestNotification object:2];
+    [self assert:3 equals:notificationCount message:@"observer should be notified for object '2' and for any object"];
+
+    [center removeObserver:observer2 name:TestNotification object:2];
+    [center postNotificationName:TestNotification object:2];
+    [self assert:4 equals:notificationCount message:@"observer should be notified only for any object"];
+
+    // At this point we have TestNofication:nil observer and a TestNotification:25 observer.
+    observer2 = [center addObserverForName:nil object:2 queue:nil usingBlock:notificationBlock];
+
+    [center postNotificationName:TestNotification object:2];
+    [self assert:6 equals:notificationCount message:@"observer should be notified for TestNofication and for object '2' (TestNotification)"];
+    [center postNotificationName:@"RandomNotification" object:2];
+    [self assert:7 equals:notificationCount message:@"observer should be notified for object '2' (RandomNotification)"];
+
+    [center removeObserver:observer2];
+    [center removeObserver:observer25];
+    [center removeObserver:observerNil];
+    [center postNotificationName:TestNotification object:nil];
+    [center postNotificationName:TestNotification object:2];
+    [center postNotificationName:TestNotification object:25];
+    [self assert:7 equals:notificationCount message:@"observer should not be notified"];
+}
+
 - (void)testAddObserversDuringNotification
 {
     var center = [CPNotificationCenter defaultCenter];