Fixed: documentation version number lagging behind.

Without this check, an index set could be initialised with NaN which would later lead to an infinite loop when enumerating the index set.

This error makes the error early and explicit.

AppKit/CPAlert.j

@@ -537,7 +537,7 @@ CPCriticalAlertStyle        = 2;
     if (_showSuppressionButton)
         lastView = _suppressionButton;
     else if (_accessoryView)
-        lastView = _accessoryView
+        lastView = _accessoryView;
 
     finalSize = [self _layoutButtonsFromView:lastView];
     if ([_window styleMask] & CPDocModalWindowMask)
@@ -689,42 +689,63 @@ CPCriticalAlertStyle        = 2;
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[CGSizeMake(400.0, 110.0), CGInsetMake(15, 15, 15, 50), 6, 10,
-                                                CPJustifiedTextAlignment, [CPColor blackColor], [CPFont boldSystemFontOfSize:13.0], [CPNull null], CGSizeMakeZero(),
-                                                CPJustifiedTextAlignment, [CPColor blackColor], [CPFont systemFontOfSize:12.0], [CPNull null], CGSizeMakeZero(),
-                                                CGPointMake(15, 12),
-                                                [CPNull null],
-                                                [CPNull null],
-                                                [CPNull null],
-                                                [CPNull null],
-                                                [CPNull null],
-                                                [CPNull null],
-                                                0.0,
-                                                0.0,
-                                                3.0,
-                                                [CPColor blackColor],
-                                                [CPFont systemFontOfSize:12.0],
-                                                [CPNull null],
-                                                0.0
-                                                ]
-                                       forKeys:[@"size", @"content-inset", @"informative-offset", @"button-offset",
-                                                @"message-text-alignment", @"message-text-color", @"message-text-font", @"message-text-shadow-color", @"message-text-shadow-offset",
-                                                @"informative-text-alignment", @"informative-text-color", @"informative-text-font", @"informative-text-shadow-color", @"informative-text-shadow-offset",
-                                                @"image-offset",
-                                                @"information-image",
-                                                @"warning-image",
-                                                @"error-image",
-                                                @"help-image",
-                                                @"help-image-left-offset",
-                                                @"help-image-pressed",
-                                                @"suppression-button-y-offset",
-                                                @"suppression-button-x-offset",
-                                                @"default-elements-margin",
-                                                @"suppression-button-text-color",
-                                                @"suppression-button-text-font",
-                                                @"suppression-button-text-shadow-color",
-                                                @"suppression-button-text-shadow-offset"
-                                                ]];
+    return [CPDictionary dictionaryWithObjects:[
+                CGSizeMake(400.0, 110.0),
+                CGInsetMake(15, 15, 15, 50), 6, 10,
+                CPJustifiedTextAlignment,
+                [CPColor blackColor],
+                [CPFont boldSystemFontOfSize:13.0],
+                [CPNull null], CGSizeMakeZero(),
+                CPJustifiedTextAlignment,
+                [CPColor blackColor],
+                [CPFont systemFontOfSize:12.0],
+                [CPNull null], CGSizeMakeZero(),
+                CGPointMake(15, 12),
+                [CPNull null],
+                [CPNull null],
+                [CPNull null],
+                [CPNull null],
+                [CPNull null],
+                [CPNull null],
+                0.0,
+                0.0,
+                3.0,
+                [CPColor blackColor],
+                [CPFont systemFontOfSize:12.0],
+                [CPNull null],
+                0.0
+            ]
+            forKeys:[
+                @"size",
+                @"content-inset",
+                @"informative-offset",
+                @"button-offset",
+                @"message-text-alignment",
+                @"message-text-color",
+                @"message-text-font",
+                @"message-text-shadow-color",
+                @"message-text-shadow-offset",
+                @"informative-text-alignment",
+                @"informative-text-color",
+                @"informative-text-font",
+                @"informative-text-shadow-color",
+                @"informative-text-shadow-offset",
+                @"image-offset",
+                @"information-image",
+                @"warning-image",
+                @"error-image",
+                @"help-image",
+                @"help-image-left-offset",
+                @"help-image-pressed",
+                @"suppression-button-y-offset",
+                @"suppression-button-x-offset",
+                @"default-elements-margin",
+                @"suppression-button-text-color",
+                @"suppression-button-text-font",
+                @"suppression-button-text-shadow-color",
+                @"suppression-button-text-shadow-offset"
+            ]
+        ];
 }
 
 @end

AppKit/CPApplication.j

@@ -86,6 +86,7 @@ CPRunContinuesResponse  = -1002;
     CPArray                 _eventListeners;
 
     CPEvent                 _currentEvent;
+    CPWindow                _lastMouseMoveWindow;
 
     CPArray                 _windows;
     CPWindow                _keyWindow;
@@ -621,10 +622,16 @@ CPRunContinuesResponse  = -1002;
         return;
     }
 
+    if ([anEvent type] == CPMouseMoved)
+    {
+        if (theWindow !== _lastMouseMoveWindow)
+            [_lastMouseMoveWindow _mouseExitedResizeRect];
+
+        _lastMouseMoveWindow = theWindow;
+    }
+
     if (theWindow)
         [theWindow sendEvent:anEvent];
-    else if ([anEvent type] == CPMouseMoved)
-        [[CPCursor arrowCursor] set];
 }
 
 /*!
@@ -963,6 +970,7 @@ CPRunContinuesResponse  = -1002;
         [aWindow orderFront:self];
         [aSheet setPlatformWindow:[aWindow platformWindow]];
     }
+
     [aWindow _attachSheet:aSheet modalDelegate:aModalDelegate didEndSelector:aDidEndSelector contextInfo:aContextInfo];
 }
 

AppKit/CPCompatibility.j

@@ -310,11 +310,18 @@ function CPBrowserStyleProperty(aProperty)
                 break;
             default:
                 var prefixes = ["Webkit", "Moz", "O", "ms"],
-                    capProperty = [aProperty capitalizedString];
+                    strippedProperty = aProperty.split('-').join(' '),
+                    capProperty = [strippedProperty capitalizedString].split(' ').join('');
 
                 for (var i = 0; i < prefixes.length; i++)
                 {
-                    if (prefixes[i] + capProperty in testElement.style)
+                    // First check if the property is already valid without being formatted, otherwise try the capitalized property
+                    if (prefixes[i] + aProperty in testElement.style)
+                    {
+                        r = prefixes[i] + aProperty;
+                        break;
+                    }
+                    else if (prefixes[i] + capProperty in testElement.style)
                     {
                         r = prefixes[i] + capProperty;
                         break;
@@ -352,9 +359,21 @@ function CPBrowserCSSProperty(aProperty)
     {
         if (browserProperty.substring(0, prefix.length) == prefix)
         {
-            return prefixes[prefix] + browserProperty.substring(prefix.length).toLowerCase();
+            var browserPropertyWithoutPrefix = browserProperty.substring(prefix.length),
+                parts = browserPropertyWithoutPrefix.match(/[A-Z][a-z]+/g);
+
+            // If there were any capitalized words in the browserProperty, insert a "-" between each one
+            if (parts && parts.length > 0)
+                browserPropertyWithoutPrefix = parts.join("-");
+
+            return prefixes[prefix] + browserPropertyWithoutPrefix.toLowerCase();
         }
     }
 
+    var parts = browserProperty.match(/[A-Z][a-z]+/g);
+
+    if (parts && parts.length > 0)
+        browserProperty = parts.join("-");
+
     return browserProperty.toLowerCase();
 }

AppKit/CPCookie.j

@@ -94,7 +94,7 @@
         domain = "";
 
 #if PLATFORM(DOM)
-    document.cookie = _cookieName+"="+value+expires+"; path=/"+domain;
+    document.cookie = _cookieName + "=" + value + expires + "; path=/" + domain;
 #else
     _cookieValue = value;
     _expires = expires;

AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j

@@ -3,6 +3,8 @@
  *     Copyright (c) 2011 Pear, Inc. All rights reserved.
  */
 
+@import "CPPopUpButton.j"
+
 var GRADIENT_START_COLOR = "#fcfcfc",
     GRADIENT_END_COLOR = "#dfdfdf",
     BORDER_COLOR = "#BDBDBD";

AppKit/CPSegmentedControl.j

@@ -115,13 +115,15 @@ CPSegmentSwitchTrackingMomentary = 2;
     if (_selectedSegment >= _segments.length)
         _selectedSegment = -1;
 
-    // Make space for/remove space used by dividers.
     var thickness = [self currentValueForThemeAttribute:@"divider-thickness"],
-        delta = thickness * (dividersAfter - dividersBefore),
-        frame = [self frame];
+        frame = [self frame],
+        widthOfAllSegments = 0,
+        dividerExtraSpace = ([_segments count] - 1) * thickness;
 
-    if (delta)
-        [self setFrameSize:CGSizeMake(frame.size.width + delta, frame.size.height)];
+    for (var i = 0; i < [_segments count]; i++)
+        widthOfAllSegments += [_segments[i] width];
+
+    [self setFrameSize:CGSizeMake(widthOfAllSegments + dividerExtraSpace, frame.size.height)];
 
     [self tileWithChangedSegment:0];
 }

AppKit/CPTextField.j

@@ -46,13 +46,44 @@ var CPTextFieldDOMInputElement = nil,
     CPTextFieldInputIsActive = NO,
     CPTextFieldCachedSelectStartFunction = nil,
     CPTextFieldCachedDragFunction = nil,
-    CPTextFieldBlurFunction = nil,
+    CPTextFieldBlurHandler = nil,
     CPTextFieldInputFunction = nil;
 
 #endif
 
 var CPSecureTextFieldCharacter = "\u2022";
 
+
+function CPTextFieldBlurFunction(anEvent, owner, domElement, inputElement, resigning, didBlurRef)
+{
+    if (owner && domElement != inputElement.parentNode)
+        return;
+
+    if (!resigning && [[owner window] isKeyWindow])
+    {
+        /*
+            Browsers blur text fields when a click occurs anywhere outside the text field. That is normal for browsers, but in Cocoa the key view retains focus unless the click target accepts first responder. So if we lost focus but were not told to resign and our window is still key, restore focus.
+        */
+        window.setTimeout(function()
+        {
+            inputElement.focus();
+        }, 0.0);
+    }
+
+    CPTextFieldHandleBlur(anEvent, AT_REF(owner));
+    AT_DEREF(didBlurRef, YES);
+
+    return true;
+}
+
+function CPTextFieldHandleBlur(anEvent, ownerRef)
+{
+    AT_DEREF(ownerRef, nil);
+
+    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+}
+
+
 @implementation CPString (CPTextFieldAdditions)
 
 /*!
@@ -188,28 +219,15 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         CPTextFieldDOMInputElement.style.background = "transparent";
         CPTextFieldDOMInputElement.style.outline = "none";
 
-        CPTextFieldBlurFunction = function(anEvent)
+        CPTextFieldBlurHandler = function(anEvent)
         {
-            if (CPTextFieldInputOwner && CPTextFieldInputOwner._DOMElement != CPTextFieldDOMInputElement.parentNode)
-                return;
-
-            if (!CPTextFieldInputResigning)
-            {
-                [[CPTextFieldInputOwner window] makeFirstResponder:nil];
-                return;
-            }
-
-            CPTextFieldHandleBlur(anEvent, CPTextFieldDOMInputElement);
-            CPTextFieldInputDidBlur = YES;
-
-            return true;
-        };
-
-        CPTextFieldHandleBlur = function(anEvent)
-        {
-            CPTextFieldInputOwner = nil;
-
-            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+            return CPTextFieldBlurFunction(
+                        anEvent,
+                        CPTextFieldInputOwner,
+                        CPTextFieldInputOwner._DOMElement,
+                        CPTextFieldDOMInputElement,
+                        CPTextFieldInputResigning,
+                        AT_REF(CPTextFieldInputDidBlur));
         };
 
         if (CPFeatureIsCompatible(CPInputOnInputEventFeature))
@@ -219,9 +237,16 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
                 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];
 
@@ -231,8 +256,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
             CPTextFieldDOMInputElement.oninput = CPTextFieldInputFunction;
         }
 
-        //FIXME make this not onblur
-        CPTextFieldDOMInputElement.onblur = CPTextFieldBlurFunction;
+        // FIXME make this not onblur
+        CPTextFieldDOMInputElement.onblur = CPTextFieldBlurHandler;
 
         CPTextFieldDOMStandardInputElement = CPTextFieldDOMInputElement;
     }
@@ -261,7 +286,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
             CPTextFieldDOMPasswordInputElement.style.outline = "none";
             CPTextFieldDOMPasswordInputElement.type = "password";
 
-            CPTextFieldDOMPasswordInputElement.onblur = CPTextFieldBlurFunction;
+            CPTextFieldDOMPasswordInputElement.onblur = CPTextFieldBlurHandler;
         }
 
         CPTextFieldDOMInputElement = CPTextFieldDOMPasswordInputElement;
@@ -494,12 +519,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 /* @ignore */
 - (BOOL)becomeFirstResponder
 {
-#if PLATFORM(DOM)
-    // FIXME Why do we care about who's the first responder in a different window?
-    if (CPTextFieldInputOwner && [CPTextFieldInputOwner window] !== [self window])
-        [[CPTextFieldInputOwner window] makeFirstResponder:nil];
-#endif
-
     // As long as we are the first responder we need to monitor the key status of our window.
     [self _setObserveWindowKeyNotifications:YES];
 
@@ -512,7 +531,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 }
 
 /*!
-    A text field can be the first responder without necessarily being the focus of keyboard input. For example, it might be the first responder of window A but window B is the main and key window. It's important we don't put a focused input field into a text field in a non key window, even if that field is the first responder, because the key window might also have a first responder text field which the user will expect to receive keyboard input.
+    A text field can be the first responder without necessarily being the focus of keyboard input. For example, it might be the first responder of window A but window B is the main and key window. It's important we don't put a focused input field into a text field in a non-key window, even if that field is the first responder, because the key window might also have a first responder text field which the user will expect to receive keyboard input.
 
     Since a first responder but non-key window text field can't receive input it should not even look like an active text field (Cocoa has a "slightly active" text field look it uses when another window is the key window, but Cappuccino doesn't today.)
 */
@@ -534,8 +553,10 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
     element.value = _stringValue;
     element.style.color = [[self currentValueForThemeAttribute:@"text-color"] cssString];
+
     if (CPFeatureIsCompatible(CPInputSetFontOutsideOfDOM))
         element.style.font = [font cssString];
+
     element.style.zIndex = 1000;
 
     switch ([self alignment])
@@ -571,35 +592,24 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
     element.style.top = topPoint;
     var left = _CGRectGetMinX(contentRect);
+
     // 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.height = ROUND(lineHeight) + "px";
     element.style.lineHeight = ROUND(lineHeight) + "px";
-    element.style.verticalAlign = @"top";
+    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.
+    // 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];
 
-    window.setTimeout(function()
-    {
-        element.focus();
-
-        // Select the text if the textfield became first responder through keyboard interaction
-        if (!_willBecomeFirstResponderByClick)
-            [self _selectText:self immediately:YES];
-
-        _willBecomeFirstResponderByClick = NO;
-
-        [self textDidFocus:[CPNotification notificationWithName:CPTextFieldDidFocusNotification object:self userInfo:nil]];
-        CPTextFieldInputOwner = self;
-    }, 0.0);
-
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
 
     CPTextFieldInputIsActive = YES;
@@ -612,6 +622,28 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         [[self window] platformWindow]._DOMBodyElement.ondrag = function () {};
         [[self window] platformWindow]._DOMBodyElement.onselectstart = function () {};
     }
+
+    CPTextFieldInputOwner = self;
+
+    window.setTimeout(function()
+    {
+        /*
+            setTimeout handlers are not guaranteed to fire in the order they were initiated. This can cause a race condition when several windows with text fields are opened quickly, resulting in several instances of this timeout function being fired, perhaps out of order. So we have to check that by the time this function is fired, CPTextFieldInputOwner has not been changed to another text field in the meantime.
+        */
+        if (CPTextFieldInputOwner !== self)
+            return;
+
+        element.focus();
+
+        // Select the text if the textfield became first responder through keyboard interaction
+        if (!_willBecomeFirstResponderByClick)
+            [self _selectText:self immediately:YES];
+
+        _willBecomeFirstResponderByClick = NO;
+
+        [self textDidFocus:[CPNotification notificationWithName:CPTextFieldDidFocusNotification object:self userInfo:nil]];
+    }, 0.0);
+
 #endif
 }
 
@@ -677,7 +709,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         element.blur();
 
     if (!CPTextFieldInputDidBlur)
-        CPTextFieldBlurFunction();
+        CPTextFieldBlurHandler();
 
     CPTextFieldInputDidBlur = NO;
     CPTextFieldInputResigning = NO;

AppKit/CPTokenField.j

@@ -21,6 +21,7 @@
  */
 
 #import "../Foundation/CPRange.h"
+#import "../Foundation/Ref.h"
 
 @import <Foundation/CPCharacterSet.j>
 @import <Foundation/CPIndexSet.j>
@@ -47,7 +48,7 @@ var CPTokenFieldDOMInputElement = nil,
     CPTokenFieldCachedDragFunction = nil,
     CPTokenFieldFocusInput = NO,
 
-    CPTokenFieldBlurFunction = nil;
+    CPTokenFieldBlurHandler = nil;
 
 #endif
 
@@ -71,7 +72,6 @@ var CPScrollDestinationNone             = 0,
 
     CPEvent             _mouseDownEvent;
 
-    BOOL                _preventResign;
     BOOL                _shouldNotifyTarget;
 }
 
@@ -390,9 +390,6 @@ var CPScrollDestinationNone             = 0,
 
 - (BOOL)resignFirstResponder
 {
-    if (_preventResign)
-        return NO;
-
     [self _autocomplete];
 
     // From CPTextField superclass.
@@ -427,7 +424,7 @@ var CPScrollDestinationNone             = 0,
     element.blur();
 
     if (!CPTokenFieldInputDidBlur)
-        CPTokenFieldBlurFunction();
+        CPTokenFieldBlurHandler();
 
     CPTokenFieldInputDidBlur = NO;
     CPTokenFieldInputResigning = NO;
@@ -451,7 +448,6 @@ var CPScrollDestinationNone             = 0,
 
 - (void)mouseDown:(CPEvent)anEvent
 {
-    _preventResign = YES;
     _mouseDownEvent = anEvent;
 
     [self _selectToken:nil byExtendingSelection:NO];
@@ -461,13 +457,11 @@ var CPScrollDestinationNone             = 0,
 
 - (void)mouseUp:(CPEvent)anEvent
 {
-    _preventResign = NO;
     _mouseDownEvent = nil;
 }
 
 - (void)_mouseDownOnToken:(_CPTokenFieldToken)aToken withEvent:(CPEvent)anEvent
 {
-    _preventResign = YES;
     _mouseDownEvent = anEvent;
 }
 
@@ -480,8 +474,6 @@ var CPScrollDestinationNone             = 0,
         // Snap to the token if it's only half visible due to mouse wheel scrolling.
         _shouldScrollTo = aToken;
     }
-
-    _preventResign = NO;
 }
 
 // ===========
@@ -652,38 +644,19 @@ var CPScrollDestinationNone             = 0,
         CPTokenFieldDOMInputElement.style.background = "transparent";
         CPTokenFieldDOMInputElement.style.outline = "none";
 
-        CPTokenFieldBlurFunction = function(anEvent)
+        CPTokenFieldBlurHandler = function(anEvent)
         {
-            if (CPTokenFieldInputOwner && [CPTokenFieldInputOwner._tokenScrollView documentView]._DOMElement != CPTokenFieldDOMInputElement.parentNode)
-                return;
-
-            if (CPTokenFieldInputOwner && CPTokenFieldInputOwner._preventResign)
-                return false;
-
-            if (!CPTokenFieldInputResigning && [[CPTokenFieldInputOwner window] isKeyWindow])
-            {
-                // If we lost focus somehow but we're not resigning and we're still in the key window, we'll need to take it back.
-                window.setTimeout(function()
-                {
-                    CPTokenFieldDOMInputElement.focus();
-                }, 0.0);
-            }
-
-            CPTokenFieldHandleBlur(anEvent, CPTokenFieldDOMInputElement);
-            CPTokenFieldInputDidBlur = YES;
-
-            return true;
+            return CPTextFieldBlurFunction(
+                        anEvent,
+                        CPTokenFieldInputOwner,
+                        [CPTokenFieldInputOwner._tokenScrollView documentView]._DOMElement,
+                        CPTokenFieldDOMInputElement,
+                        CPTokenFieldInputResigning,
+                        AT_REF(CPTokenFieldInputDidBlur));
         };
 
-        CPTokenFieldHandleBlur = function(anEvent)
-        {
-            CPTokenFieldInputOwner = nil;
-
-            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-        };
-
-        //FIXME make this not onblur
-        CPTokenFieldDOMInputElement.onblur = CPTokenFieldBlurFunction;
+        // FIXME make this not onblur
+        CPTokenFieldDOMInputElement.onblur = CPTokenFieldBlurHandler;
 
         CPTokenFieldDOMStandardInputElement = CPTokenFieldDOMInputElement;
     }
@@ -706,11 +679,7 @@ var CPScrollDestinationNone             = 0,
 {
     if (![self hasThemeState:CPThemeStateEditing])
         return @"";
-#if PLATFORM(DOM)
     return [self _inputElement].value;
-#else
-    return @"";
-#endif
 }
 
 - (void)moveUp:(id)sender

AppKit/CPTreeNode.j

@@ -1,3 +1,24 @@
+/*
+ * CPTreeNode.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
 @import <Foundation/CPObject.j>
 @import <Foundation/CPIndexPath.j>

AppKit/CPView.j

@@ -463,7 +463,7 @@ var CPViewFlags                     = { },
     // We will have to adjust the z-index of all views starting at this index.
     var count = _subviews.length;
 
-    // dirty the key view loop, in case the window wants to auto recalculate it
+    // Dirty the key view loop, in case the window wants to auto recalculate it
     [[self window] _dirtyKeyViewLoop];
 
     // If this is already one of our subviews, remove it.
@@ -544,7 +544,7 @@ var CPViewFlags                     = { },
     if (!_superview)
         return;
 
-    // dirty the key view loop, in case the window wants to auto recalculate it
+    // Dirty the key view loop, in case the window wants to auto recalculate it
     [[self window] _dirtyKeyViewLoop];
 
     [_superview willRemoveSubview:self];
@@ -651,9 +651,6 @@ var CPViewFlags                     = { },
     if (_window === aWindow)
         return;
 
-    // Unlike in Cocoa you can observe the window of a view.
-    [self willChangeValueForKey:@"window"];
-
     [[self window] _dirtyKeyViewLoop];
 
     // Clear out first responder if we're the first responder and leaving.
@@ -681,8 +678,6 @@ var CPViewFlags                     = { },
     [self viewDidMoveToWindow];
 
     [[self window] _dirtyKeyViewLoop];
-
-    [self didChangeValueForKey:@"window"];
 }
 
 /*!

AppKit/CPWindow/CPWindow.j

@@ -312,6 +312,7 @@ var CPWindowActionMessageKeys = [
     CPToolbar                           _toolbar;
     CPResponder                         _firstResponder;
     CPResponder                         _initialFirstResponder;
+    BOOL                                _hasBecomeKeyWindow;
     id                                  _delegate;
 
     CPString                            _title;
@@ -368,7 +369,7 @@ var CPWindowActionMessageKeys = [
 
     var bundle = [CPBundle bundleForClass:[CPWindow class]];
 
-    CPWindowSavingImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(16.0, 16.0)]
+    CPWindowSavingImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:_CGSizeMake(16.0, 16.0)]
 }
 
 - (id)init
@@ -438,11 +439,11 @@ CPTexturedBackgroundWindowMask
 
         [self setLevel:CPNormalWindowLevel];
 
-        _minSize = CGSizeMake(0.0, 0.0);
-        _maxSize = CGSizeMake(1000000.0, 1000000.0);
+        _minSize = _CGSizeMake(0.0, 0.0);
+        _maxSize = _CGSizeMake(1000000.0, 1000000.0);
 
         // Create our border view which is the actual root of our view hierarchy.
-        _windowView = [[windowViewClass alloc] initWithFrame:CGRectMake(0.0, 0.0, CGRectGetWidth(_frame), CGRectGetHeight(_frame)) styleMask:aStyleMask];
+        _windowView = [[windowViewClass alloc] initWithFrame:_CGRectMake(0.0, 0.0, _CGRectGetWidth(_frame), _CGRectGetHeight(_frame)) styleMask:aStyleMask];
 
         [_windowView _setWindow:self];
         [_windowView setNextResponder:self];
@@ -450,8 +451,7 @@ CPTexturedBackgroundWindowMask
         [self setMovableByWindowBackground:aStyleMask & CPHUDBackgroundWindowMask];
 
         // Create a generic content view.
-        [self setContentView:[[CPView alloc] initWithFrame:CGRectMakeZero()]];
-        [self setInitialFirstResponder:[self contentView]];
+        [self setContentView:[[CPView alloc] initWithFrame:_CGRectMakeZero()]];
 
         _firstResponder = self;
 
@@ -480,7 +480,8 @@ CPTexturedBackgroundWindowMask
 
         _autorecalculatesKeyViewLoop = NO;
         _defaultButtonEnabled = YES;
-        _keyViewLoopIsDirty = YES;
+        _keyViewLoopIsDirty = NO;
+        _hasBecomeKeyWindow = NO;
 
         [self setShowsResizeIndicator:_styleMask & CPResizableWindowMask];
 
@@ -543,14 +544,8 @@ CPTexturedBackgroundWindowMask
 
 - (void)awakeFromCib
 {
-    _keyViewLoopIsDirty = ![self _hasKeyViewLoop];
-
-    // If no key view loop has been specified by hand, and we are not intending to auto recalculate,
-    // set up a default key view loop.
-    if (_keyViewLoopIsDirty && ![self autorecalculatesKeyViewLoop])
-        [self recalculateKeyViewLoop];
-
-    // At this time we know the final screen (or browser) size and can apply the positioning mask, if any, from the nib.
+    // At this time we know the final screen (or browser) size
+    // and can apply the positioning mask, if any, from the nib.
     if (_positioningScreenRect)
     {
         var actualScreenRect = [CPPlatform isBrowser] ? [_platformWindow contentBounds] : [[self screen] visibleFrame],
@@ -592,6 +587,34 @@ CPTexturedBackgroundWindowMask
             [self setFrameOrigin:origin];
         }
     }
+
+    /*
+        Calculate the key view loop if necessary. Note that Cocoa does not call recalculateKeyViewLoop when awaking a nib. If a key view loop was set in the cib, we have to chain it to the content view.
+    */
+    if ([self _hasKeyViewLoop:[_contentView subviews]])
+    {
+        var views = [self _viewsSortedByPosition],
+            count = [views count];
+
+        // The first view is the content view.
+        // Find the first subview that has a next key view.
+        for (var i = 1; i < count; ++i)
+        {
+            var view = views[i];
+
+            if ([view nextKeyView])
+            {
+                [_contentView setNextKeyView:view];
+                break;
+            }
+        }
+    }
+    else
+    {
+        // Cooca does NOT call the public method recalculateKeyViewLoop for nibs,
+        // but it does calculate the loop.
+        [self _doRecalculateKeyViewLoop];
+    }
 }
 
 - (void)_setWindowView:(CPView)aWindowView
@@ -657,7 +680,7 @@ CPTexturedBackgroundWindowMask
         _fullPlatformWindowSession = _CPWindowFullPlatformWindowSessionMake(_windowView, [self contentRectForFrameRect:[self frame]], [self hasShadow], [self level]);
 
         var fullPlatformWindowViewClass = [[self class] _windowViewClassForFullPlatformWindowStyleMask:_styleMask],
-            windowView = [[fullPlatformWindowViewClass alloc] initWithFrame:CGRectMakeZero() styleMask:_styleMask];
+            windowView = [[fullPlatformWindowViewClass alloc] initWithFrame:_CGRectMakeZero() styleMask:_styleMask];
 
         [self _setWindowView:windowView];
 
@@ -912,8 +935,6 @@ CPTexturedBackgroundWindowMask
 
     [_platformWindow orderFront:self];
     [_platformWindow order:CPWindowAbove window:self relativeTo:nil];
-#else
-    _isVisible = YES;
 #endif
 
     if (!CPApp._keyWindow)
@@ -959,8 +980,6 @@ CPTexturedBackgroundWindowMask
 
 #if PLATFORM(DOM)
     [_platformWindow order:CPWindowOut window:self relativeTo:nil];
-#else
-    _isVisible = NO;
 #endif
 
     [self _updateMainAndKeyWindows];
@@ -1088,19 +1107,20 @@ CPTexturedBackgroundWindowMask
     if (_contentView)
         [_contentView removeFromSuperview];
 
-    var bounds = CGRectMake(0.0, 0.0, CGRectGetWidth(_frame), CGRectGetHeight(_frame));
-
-    // During init the initial first responder is set to the contentView
-    // if it hasn't changed in the mean time we need to update that reference
-    // to the new contentView
-    if (_initialFirstResponder === _contentView)
-        [self setInitialFirstResponder:aView];
+    var bounds = _CGRectMake(0.0, 0.0, _CGRectGetWidth(_frame), _CGRectGetHeight(_frame));
 
     _contentView = aView;
     [_contentView setFrame:[self contentRectForFrameRect:bounds]];
 
     [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
     [_windowView addSubview:_contentView];
+
+    /*
+        If the initial first responder has been set to something other than
+        the window, set it to the window because it will no longer be valid.
+    */
+    if (_initialFirstResponder && _initialFirstResponder !== self)
+        _initialFirstResponder = self;
 }
 
 /*!
@@ -1152,12 +1172,12 @@ CPTexturedBackgroundWindowMask
 */
 - (void)setMinSize:(CGSize)aSize
 {
-    if (CGSizeEqualToSize(_minSize, aSize))
+    if (_CGSizeEqualToSize(_minSize, aSize))
         return;
 
-    _minSize = CGSizeCreateCopy(aSize);
+    _minSize = _CGSizeMakeCopy(aSize);
 
-    var size = CGSizeMakeCopy([self frame].size),
+    var size = _CGSizeMakeCopy([self frame].size),
         needsFrameChange = NO;
 
     if (size.width < _minSize.width)
@@ -1192,12 +1212,12 @@ CPTexturedBackgroundWindowMask
 */
 - (void)setMaxSize:(CGSize)aSize
 {
-    if (CGSizeEqualToSize(_maxSize, aSize))
+    if (_CGSizeEqualToSize(_maxSize, aSize))
         return;
 
-    _maxSize = CGSizeCreateCopy(aSize);
+    _maxSize = _CGSizeMakeCopy(aSize);
 
-    var size = CGSizeMakeCopy([self frame].size),
+    var size = _CGSizeMakeCopy([self frame].size),
         needsFrameChange = NO;
 
     if (size.width > _maxSize.width)
@@ -1253,8 +1273,8 @@ CPTexturedBackgroundWindowMask
     {
         var bounds = [_windowView bounds];
 
-        _shadowView = [[CPView alloc] initWithFrame:CGRectMake(-SHADOW_MARGIN_LEFT, -SHADOW_MARGIN_TOP + SHADOW_DISTANCE,
-            SHADOW_MARGIN_LEFT + CGRectGetWidth(bounds) + SHADOW_MARGIN_RIGHT, SHADOW_MARGIN_TOP + CGRectGetHeight(bounds) + SHADOW_MARGIN_BOTTOM)];
+        _shadowView = [[CPView alloc] initWithFrame:_CGRectMake(-SHADOW_MARGIN_LEFT, -SHADOW_MARGIN_TOP + SHADOW_DISTANCE,
+            SHADOW_MARGIN_LEFT + _CGRectGetWidth(bounds) + SHADOW_MARGIN_RIGHT, SHADOW_MARGIN_TOP + _CGRectGetHeight(bounds) + SHADOW_MARGIN_BOTTOM)];
 
         if (!_CPWindowShadowColor)
         {
@@ -1262,17 +1282,17 @@ CPTexturedBackgroundWindowMask
 
             _CPWindowShadowColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
                 [
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowShadow0.png"] size:CGSizeMake(20.0, 19.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowShadow1.png"] size:CGSizeMake(1.0, 19.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowShadow2.png"] size:CGSizeMake(19.0, 19.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowShadow0.png"] size:_CGSizeMake(20.0, 19.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowShadow1.png"] size:_CGSizeMake(1.0, 19.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowShadow2.png"] size:_CGSizeMake(19.0, 19.0)],
 
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowShadow3.png"] size:CGSizeMake(20.0, 1.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowShadow4.png"] size:CGSizeMake(1.0, 1.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowShadow5.png"] size:CGSizeMake(19.0, 1.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowShadow3.png"] size:_CGSizeMake(20.0, 1.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowShadow4.png"] size:_CGSizeMake(1.0, 1.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowShadow5.png"] size:_CGSizeMake(19.0, 1.0)],
 
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowShadow6.png"] size:CGSizeMake(20.0, 18.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowShadow7.png"] size:CGSizeMake(1.0, 18.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowShadow8.png"] size:CGSizeMake(19.0, 18.0)]
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowShadow6.png"] size:_CGSizeMake(20.0, 18.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowShadow7.png"] size:_CGSizeMake(1.0, 18.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPWindow/CPWindowShadow8.png"] size:_CGSizeMake(19.0, 18.0)]
                 ]]];
         }
 
@@ -1446,43 +1466,35 @@ CPTexturedBackgroundWindowMask
 
 - (void)setInitialFirstResponder:(CPView)aView
 {
-    // Before an initial first responder is set, be sure to calculate the key loop
-    [self _setupFirstResponder:aView];
-
     _initialFirstResponder = aView;
 }
 
-- (void)_setupFirstResponder:(CPView)anInitialFirstResponder
+- (void)_setupFirstResponder
 {
     /*
-        If:
-
-        - The key loop is dirty
-        - The key loop does not auto-recalculate
-        - No view within the window has become first responder
-        - No initial first responder has been set
-
-        Then calculate the key view loop and set the first responder
-        to the first view in the loop if no initial responder has been set, since we should
-        always have an initial first responder and a key loop by default.
+        When the window is first made the key window, if the first responder is the window, use the initial first responder if there is one. If there is a first responder and it is not the window, ignore the initial first responder.
     */
-    if (_keyViewLoopIsDirty &&
-        !_autorecalculatesKeyViewLoop &&
-        _firstResponder === self &&
-        _initialFirstResponder === [self contentView])
+    if (!_hasBecomeKeyWindow)
     {
-        [self recalculateKeyViewLoop];
-
-        if (anInitialFirstResponder)
-            [self makeFirstResponder:anInitialFirstResponder];
-        else
+        if (_firstResponder === self)
         {
-            // Make the first key view of the content view the first responder
-            var firstKeyView = [[self contentView] nextValidKeyView];
+            if (_initialFirstResponder)
+                [self makeFirstResponder:_initialFirstResponder];
+            else
+            {
+                // Make the first valid key view the first responder
+                var view = [_contentView nextValidKeyView];
 
-            [self makeFirstResponder:firstKeyView];
+                if (view)
+                    [self makeFirstResponder:view];
+            }
+
+            return;
         }
     }
+
+    if (_firstResponder)
+        [self makeFirstResponder:_firstResponder];
 }
 
 /*!
@@ -1542,6 +1554,11 @@ CPTexturedBackgroundWindowMask
     _ignoresMouseEvents = shouldIgnoreMouseEvents;
 }
 
+- (void)_mouseExitedResizeRect
+{
+    [[CPCursor arrowCursor] set];
+}
+
 // Managing Titles
 
 /*!
@@ -1659,7 +1676,7 @@ CPTexturedBackgroundWindowMask
     var size = [self frame].size,
         containerSize = [CPPlatform isBrowser] ? [_platformWindow contentBounds].size : [[self screen] visibleFrame].size;
 
-    var origin = CGPointMake((containerSize.width - size.width) / 2.0, (containerSize.height - size.height) / 2.0);
+    var origin = _CGPointMake((containerSize.width - size.width) / 2.0, (containerSize.height - size.height) / 2.0);
 
     if (origin.x < 0.0)
         origin.x = 0.0;
@@ -1779,7 +1796,7 @@ CPTexturedBackgroundWindowMask
 
         case CPLeftMouseDown:
         case CPRightMouseDown:
-            _leftMouseDownView = [_windowView hitTest:point] || _windowView;
+            _leftMouseDownView = [_windowView hitTest:point];
 
             if (_leftMouseDownView != _firstResponder && [_leftMouseDownView acceptsFirstResponder])
                 [self makeFirstResponder:_leftMouseDownView];
@@ -1887,8 +1904,9 @@ CPTexturedBackgroundWindowMask
 }
 
 /*!
-    Called when the receiver should become the key window. It also sends
-    the \c -becomeKeyWindow message to the first responder.
+    Called when the receiver should become the key window. It sends
+    the \c -becomeKeyWindow message to the first responder if it responds,
+    and posts \c CPWindowDidBecomeKeyNotification.
 */
 - (void)becomeKeyWindow
 {
@@ -1897,7 +1915,16 @@ CPTexturedBackgroundWindowMask
     if (_firstResponder !== self && [_firstResponder respondsToSelector:@selector(becomeKeyWindow)])
         [_firstResponder becomeKeyWindow];
 
-    [self _setupFirstResponder:nil];
+    if (!_hasBecomeKeyWindow)
+    {
+        // The first time a window is loaded, if it does not have a key view loop
+        // established, calculate it now.
+        if (![self _hasKeyViewLoop:[_contentView subviews]])
+            [self recalculateKeyViewLoop];
+    }
+
+    [self _setupFirstResponder];
+    _hasBecomeKeyWindow = YES;
 
     [_windowView noteKeyWindowStateChanged];
 
@@ -1912,9 +1939,16 @@ CPTexturedBackgroundWindowMask
 */
 - (BOOL)canBecomeKeyWindow
 {
-    // In Cocoa only resizable or titled windows return YES here by default. But the main browser window in Cappuccino
-    // doesn't have these masks even that it's both titled and resizable, so we return YES when isFullPlatformWindow too.
-    return (_styleMask & CPTitledWindowMask) || (_styleMask & CPResizableWindowMask) || [self isFullPlatformWindow];
+    /*
+        In Cocoa only titled windows return YES here by default. But the main browser
+        window in Cappuccino doesn't have a title bar even that it's both titled and
+        resizable, so we return YES when isFullPlatformWindow too.
+
+        Note that Cocoa will return NO for a non-titled, resizable window. The Cocoa documention
+        says it will return YES if there is a "resize bar", but in practice
+        that is not the same as the resizable mask.
+    */
+    return (_styleMask & CPTitledWindowMask) || [self isFullPlatformWindow] || _isSheet;
 }
 
 /*!
@@ -2279,11 +2313,12 @@ CPTexturedBackgroundWindowMask
 */
 - (BOOL)canBecomeMainWindow
 {
-    // FIXME: Also check if we can resize and titlebar.
-    if ([self isVisible])
-        return YES;
-
-    return NO;
+    // Note that the Cocoa documentation says that this method returns YES if
+    // the window is visible and has a title bar or a "resize mechanism". It turns
+    // out a "resize mechanism" is not the same as having the resize mask set.
+    // In practice a window must have a title bar to become main, but we make
+    // an exception for a full platform window.
+    return ([self isVisible] && ((_styleMask & CPTitledWindowMask) || _isFullPlatformWindow));
 }
 
 /*!
@@ -2444,7 +2479,7 @@ CPTexturedBackgroundWindowMask
 
 - (void)_noteToolbarChanged
 {
-    var frame = CGRectMakeCopy([self frame]),
+    var frame = _CGRectMakeCopy([self frame]),
         newFrame;
 
     [_windowView noteToolbarChanged];
@@ -2453,7 +2488,7 @@ CPTexturedBackgroundWindowMask
         newFrame = [_platformWindow visibleFrame];
     else
     {
-        newFrame = CGRectMakeCopy([self frame]);
+        newFrame = _CGRectMakeCopy([self frame]);
 
         newFrame.origin = frame.origin;
     }
@@ -2486,12 +2521,12 @@ CPTexturedBackgroundWindowMask
 - (void)_setAttachedSheetFrameOrigin
 {
     // Position the sheet above the contentRect.
-    var attachedSheet = [self attachedSheet];
-    var contentRect = [[self contentView] frame],
-        sheetFrame = CGRectMakeCopy([attachedSheet frame]);
+    var attachedSheet = [self attachedSheet],
+        contentRect = [_contentView frame],
+        sheetFrame = _CGRectMakeCopy([attachedSheet frame]);
 
-    sheetFrame.origin.y = CGRectGetMinY(_frame) + CGRectGetMinY(contentRect);
-    sheetFrame.origin.x = CGRectGetMinX(_frame) + FLOOR((CGRectGetWidth(_frame) - CGRectGetWidth(sheetFrame)) / 2.0);
+    sheetFrame.origin.y = _CGRectGetMinY(_frame) + _CGRectGetMinY(contentRect);
+    sheetFrame.origin.x = _CGRectGetMinX(_frame) + FLOOR((_CGRectGetWidth(_frame) - _CGRectGetWidth(sheetFrame)) / 2.0);
 
     [attachedSheet setFrame:sheetFrame display:YES animate:NO];
 }
@@ -2620,6 +2655,7 @@ CPTexturedBackgroundWindowMask
 - (void)animationDidEnd:(id)anim
 {
     var sheet = _sheetContext["sheet"];
+
     if (anim._window != sheet)
         return;
 
@@ -2648,15 +2684,16 @@ CPTexturedBackgroundWindowMask
     sheet._parentView = self;
 
     var originx = frame.origin.x + FLOOR((frame.size.width - sheetFrame.size.width) / 2),
-        originy = frame.origin.y + [[self contentView] frame].origin.y,
-        startFrame = CGRectMake(originx, originy, sheetFrame.size.width, 0),
-        endFrame = CGRectMake(originx, originy, sheetFrame.size.width, sheetFrame.size.height);
+        originy = frame.origin.y + [_contentView frame].origin.y,
+        startFrame = _CGRectMake(originx, originy, sheetFrame.size.width, 0),
+        endFrame = _CGRectMake(originx, originy, sheetFrame.size.width, sheetFrame.size.height);
 
     [[CPNotificationCenter defaultCenter] postNotificationName:CPWindowWillBeginSheetNotification object:self];
 
     // if sheet is attached to a modal window, the sheet runs
     // as if itself and the parent window are modal
     sheet._isModal = NO;
+
     if ([CPApp modalWindow] === self)
     {
         [CPApp runModalForWindow:sheet];
@@ -2683,7 +2720,7 @@ CPTexturedBackgroundWindowMask
 {
     var sheet = _sheetContext["sheet"],
         startFrame = [sheet frame],
-        endFrame = CGRectMakeCopy(startFrame);
+        endFrame = _CGRectMakeCopy(startFrame);
 
     if (_sheetContext["isOpening"])
     {
@@ -2810,7 +2847,7 @@ CPTexturedBackgroundWindowMask
 {
     // FIXME: should we be starting at the root, in other words _windowView?
     // The evidence seems to point to no...
-    return [[self contentView] performKeyEquivalent:anEvent];
+    return [_contentView performKeyEquivalent:anEvent];
 }
 
 - (void)keyDown:(CPEvent)anEvent
@@ -2856,9 +2893,9 @@ CPTexturedBackgroundWindowMask
     }
     else
     {
-        // Cocoa sends complete: for the escape key (in stead of the default cancelOperation:)
-        // This is also the only action that is not sent directly to the first responder, but through doCommandBySelector.
-        // The difference is that doCommandBySelector: will also send the action to the window and application delegates.
+        /*
+            Cocoa sends complete: for the escape key (instead of the default cancelOperation:). This is also the only action that is not sent directly to the first responder, but through doCommandBySelector. The difference is that doCommandBySelector: will also send the action to the window and application delegates.
+        */
         [[self firstResponder] doCommandBySelector:@selector(complete:)];
     }
 
@@ -2871,23 +2908,86 @@ CPTexturedBackgroundWindowMask
         _keyViewLoopIsDirty = YES;
 }
 
-- (BOOL)_hasKeyViewLoop
-{
-    var views = allViews(self),
-        index = [views count];
+/*
+    Recursively traverse an array of views (depth last) until we find one that has a next or previous key view set. Return nil if none can be found.
 
-    while (index--)
-        if ([views[index] nextKeyView])
+    We don't use _viewsSortedByPosition here because it is wasteful to enumerate the entire view hierarchy when we will probably find a key view at the top level.
+*/
+- (BOOL)_hasKeyViewLoop:(CPArray)theViews
+{
+    var i,
+        count = [theViews count];
+
+    for (i = 0; i < count; ++i)
+    {
+        var view = theViews[i];
+
+        if ([view nextKeyView] || [view previousKeyView])
             return YES;
+    }
+
+    for (i = 0; i < count; ++i)
+    {
+        var subviews = [theViews[i] subviews];
+
+        if ([subviews count] && [self _hasKeyViewLoop:subviews])
+            return YES;
+    }
 
     return NO;
 }
 
+/*!
+    Recalculates the key view loop, based on geometric position.
+    Note that the Cocoa documentation says that this method only marks the loop
+    as dirty, the recalculation is not done until the next or previous key view
+    of the window is requested. In reality, Cocoa does recalculate the loop
+    when this method is called.
+*/
 - (void)recalculateKeyViewLoop
 {
-    var views = allViews(self);
+    [self _doRecalculateKeyViewLoop];
+}
 
-    [views sortUsingFunction:keyViewComparator context:nil];
+- (CPArray)_viewsSortedByPosition
+{
+    var views = [CPArray arrayWithObject:_contentView];
+
+    views = views.concat([self _subviewsSortedByPosition:[_contentView subviews]]);
+
+    return views;
+}
+
+- (CPArray)_subviewsSortedByPosition:(CPArray)theSubviews
+{
+    /*
+        We first sort the subviews according to geometric order.
+        Then we go through each subview, and if it has subviews,
+        they are sorted and inserted after the superview. This
+        is done recursively.
+    */
+    theSubviews = [theSubviews copy];
+    [theSubviews sortUsingFunction:keyViewComparator context:nil];
+
+    var sortedViews = [];
+
+    for (var i = 0, count = [theSubviews count]; i < count; ++i)
+    {
+        var view = theSubviews[i],
+            subviews = [view subviews];
+
+        sortedViews.push(view);
+
+        if ([subviews count])
+            sortedViews = sortedViews.concat([self _subviewsSortedByPosition:subviews]);
+    }
+
+    return sortedViews;
+}
+
+- (void)_doRecalculateKeyViewLoop
+{
+    var views = [self _viewsSortedByPosition];
 
     for (var index = 0, count = [views count]; index < count; ++index)
         [views[index] setNextKeyView:views[(index + 1) % count]];
@@ -2901,9 +3001,6 @@ CPTexturedBackgroundWindowMask
         return;
 
     _autorecalculatesKeyViewLoop = shouldRecalculate;
-
-    if (_autorecalculatesKeyViewLoop)
-        [self _dirtyKeyViewLoop];
 }
 
 - (BOOL)autorecalculatesKeyViewLoop
@@ -2913,8 +3010,8 @@ CPTexturedBackgroundWindowMask
 
 - (void)selectNextKeyView:(id)sender
 {
-    if (_keyViewLoopIsDirty && [self autorecalculatesKeyViewLoop])
-        [self recalculateKeyViewLoop];
+    if (_keyViewLoopIsDirty)
+        [self _doRecalculateKeyViewLoop];
 
     var nextValidKeyView = nil;
 
@@ -2923,21 +3020,20 @@ CPTexturedBackgroundWindowMask
 
     if (!nextValidKeyView)
     {
-        var initialFirstResponder = _initialFirstResponder;
-
-        if ([initialFirstResponder acceptsFirstResponder])
-            nextValidKeyView = initialFirstResponder;
+        if ([_initialFirstResponder acceptsFirstResponder])
+            nextValidKeyView = _initialFirstResponder;
         else
-            nextValidKeyView = [initialFirstResponder nextValidKeyView];
+            nextValidKeyView = [_initialFirstResponder nextValidKeyView];
     }
 
-    [self makeFirstResponder:nextValidKeyView];
+    if (nextValidKeyView)
+        [self makeFirstResponder:nextValidKeyView];
 }
 
 - (void)selectPreviousKeyView:(id)sender
 {
-    if (_keyViewLoopIsDirty && [self autorecalculatesKeyViewLoop])
-        [self recalculateKeyViewLoop];
+    if (_keyViewLoopIsDirty)
+        [self _doRecalculateKeyViewLoop];
 
     var previousValidKeyView = nil;
 
@@ -2946,21 +3042,20 @@ CPTexturedBackgroundWindowMask
 
     if (!previousValidKeyView)
     {
-        var initialFirstResponder = _initialFirstResponder;
-
-        if ([initialFirstResponder acceptsFirstResponder])
-            previousValidKeyView = initialFirstResponder;
+        if ([_initialFirstResponder acceptsFirstResponder])
+            previousValidKeyView = _initialFirstResponder;
         else
-            previousValidKeyView = [initialFirstResponder previousValidKeyView];
+            previousValidKeyView = [_initialFirstResponder previousValidKeyView];
     }
 
-    [self makeFirstResponder:previousValidKeyView];
+    if (previousValidKeyView)
+        [self makeFirstResponder:previousValidKeyView];
 }
 
 - (void)selectKeyViewFollowingView:(CPView)aView
 {
-    if (_keyViewLoopIsDirty && [self autorecalculatesKeyViewLoop])
-        [self recalculateKeyViewLoop];
+    if (_keyViewLoopIsDirty)
+        [self _doRecalculateKeyViewLoop];
 
     var nextValidKeyView = [aView nextValidKeyView];
 
@@ -2970,8 +3065,8 @@ CPTexturedBackgroundWindowMask
 
 - (void)selectKeyViewPrecedingView:(CPView)aView
 {
-    if (_keyViewLoopIsDirty && [self autorecalculatesKeyViewLoop])
-        [self recalculateKeyViewLoop];
+    if (_keyViewLoopIsDirty)
+        [self _doRecalculateKeyViewLoop];
 
     var previousValidKeyView = [aView previousValidKeyView];
 
@@ -3062,19 +3157,6 @@ CPTexturedBackgroundWindowMask
 
 @end
 
-var allViews = function(aWindow)
-{
-    var views = [CPArray arrayWithObject:[aWindow contentView]];
-
-    [views addObjectsFromArray:[[aWindow contentView] subviews]];
-
-    // Start from index 1 because index 0 is the contentView and its subviews have already been added
-    for (var index = 1; index < views.length; ++index)
-        views = views.concat([views[index] subviews]);
-
-    return views;
-};
-
 var keyViewComparator = function(lhs, rhs, context)
 {
     var lhsBounds = [lhs convertRect:[lhs bounds] toView:nil],
@@ -3133,10 +3215,10 @@ var keyViewComparator = function(lhs, rhs, context)
         return;
 
     var frame = [_platformWindow contentBounds],
-        newFrame = CGRectMakeCopy(_frame),
-        dX = (CGRectGetWidth(frame) - aSize.width) /
+        newFrame = _CGRectMakeCopy(_frame),
+        dX = (_CGRectGetWidth(frame) - aSize.width) /
             (((_autoresizingMask & CPWindowMinXMargin) ? 1 : 0) + (_autoresizingMask & CPWindowWidthSizable ? 1 : 0) + (_autoresizingMask & CPWindowMaxXMargin ? 1 : 0)),
-        dY = (CGRectGetHeight(frame) - aSize.height) /
+        dY = (_CGRectGetHeight(frame) - aSize.height) /
             ((_autoresizingMask & CPWindowMinYMargin ? 1 : 0) + (_autoresizingMask & CPWindowHeightSizable ? 1 : 0) + (_autoresizingMask & CPWindowMaxYMargin ? 1 : 0));
 
     if (_autoresizingMask & CPWindowMinXMargin)
@@ -3283,16 +3365,16 @@ var keyViewComparator = function(lhs, rhs, context)
 
 - (BOOL)containsPoint:(CGPoint)aPoint
 {
-    return CGRectContainsPoint(_frame, aPoint);
+    return _CGRectContainsPoint(_frame, aPoint);
 }
 
 - (BOOL)_isValidMousePoint:(CGPoint)aPoint
 {
     // If we are using the new resizing mode, mouse events are valid
-    // outside the window's frame.
-    var mouseFrame = ((_styleMask & CPResizableWindowMask) && (CPWindowResizeStyle === CPWindowResizeStyleModern)) ? _CGRectInset(_frame, -CPWindowResizeSlop, -CPWindowResizeSlop) : _frame;
+    // outside the window's frame for non-full platform windows.
+    var mouseFrame = (!_isFullPlatformWindow && (_styleMask & CPResizableWindowMask) && (CPWindowResizeStyle === CPWindowResizeStyleModern)) ? _CGRectInset(_frame, -CPWindowResizeSlop, -CPWindowResizeSlop) : _frame;
 
-    return CGRectContainsPoint(mouseFrame, aPoint);
+    return _CGRectContainsPoint(mouseFrame, aPoint);
 }
 
 @end
@@ -3356,8 +3438,8 @@ var interpolate = function(fromValue, toValue, progress)
     {
         _window = aWindow;
 
-        _targetFrame = CGRectMakeCopy(aTargetFrame);
-        _startFrame = CGRectMakeCopy([_window frame]);
+        _targetFrame = _CGRectMakeCopy(aTargetFrame);
+        _startFrame = _CGRectMakeCopy([_window frame]);
     }
 
     return self;
@@ -3379,10 +3461,11 @@ var interpolate = function(fromValue, toValue, progress)
     if (value == 1.0)
         _window._isAnimating = NO;
 
-    var newFrame = CGRectMake(interpolate(CGRectGetMinX(_startFrame), CGRectGetMinX(_targetFrame), value),
-                              interpolate(CGRectGetMinY(_startFrame), CGRectGetMinY(_targetFrame), value),
-                              interpolate(CGRectGetWidth(_startFrame), CGRectGetWidth(_targetFrame), value),
-                              interpolate(CGRectGetHeight(_startFrame), CGRectGetHeight(_targetFrame), value));
+    var newFrame = _CGRectMake(
+            interpolate(_CGRectGetMinX(_startFrame), _CGRectGetMinX(_targetFrame), value),
+            interpolate(_CGRectGetMinY(_startFrame), _CGRectGetMinY(_targetFrame), value),
+            interpolate(_CGRectGetWidth(_startFrame), _CGRectGetWidth(_targetFrame), value),
+            interpolate(_CGRectGetHeight(_startFrame), _CGRectGetHeight(_targetFrame), value));
 
     [_window setFrame:newFrame display:YES animate:NO];
 }

AppKit/CPWindow/_CPWindowView.j

@@ -204,61 +204,107 @@ var _CPWindowViewResizeIndicatorImage = nil,
 - (int)resizeRegionForPoint:(CGPoint)aPoint
 {
     /*
-        There are 8 possible resize rects, 1 for each side and 1 for each corner.
+        If the window is fixed width (minSize.width === maxSize.width), there
+        are 2 possible resize rects: top and bottom.
+
+        If the window is fixed height (minSize.height === maxSize.height), there
+        are 2 possible resize rects: left and right.
+
+        Otherwise there are 8 possible resize rects, 1 for each side and 1 for each corner.
         The four corner rects are the same size, and the top/bottom and left/right
         rects are the same size. So to save calculations, we can just create
         3 rects and move them around to do hit testing. Start with the corners
         and then do left/right and top/bottom.
     */
-    var frame = [[self window] frame],
+    var wind = [self window],
+        frame = [wind frame],
+        rect,
+        minSize = [wind minSize],
+        maxSize = [wind maxSize],
+        isFixedWidth = minSize.width === maxSize.width,
+        isFixedHeight = minSize.height === maxSize.height;
+
+    if (isFixedWidth)
+    {
+        rect = _CGRectMake(frame.origin.x - CPWindowResizeSlop,
+                           frame.origin.y - CPWindowResizeSlop,
+                           frame.size.width + (CPWindowResizeSlop * 2),
+                           CPWindowResizeSlop * 2);
+
+        if (_CGRectContainsPoint(rect, aPoint))
+            return _CPWindowViewResizeRegionTop;
+
+        rect.origin.y = _CGRectGetMaxY(frame) - CPWindowResizeSlop;
+
+        if (_CGRectContainsPoint(rect, aPoint))
+            return _CPWindowViewResizeRegionBottom;
+    }
+    else if (isFixedHeight)
+    {
+        rect = _CGRectMake(frame.origin.x - CPWindowResizeSlop,
+                           frame.origin.y - CPWindowResizeSlop,
+                           CPWindowResizeSlop * 2,
+                           frame.size.height + (CPWindowResizeSlop * 2));
+
+        if (_CGRectContainsPoint(rect, aPoint))
+            return _CPWindowViewResizeRegionLeft;
+
+        rect.origin.x = _CGRectGetMaxX(frame) - CPWindowResizeSlop;
+
+        if (_CGRectContainsPoint(rect, aPoint))
+            return _CPWindowViewResizeRegionRight;
+    }
+    else
+    {
         rect = _CGRectMake(frame.origin.x - CPWindowResizeSlop,
                            frame.origin.y - CPWindowResizeSlop,
                            _CPWindowViewCornerResizeRectWidth + CPWindowResizeSlop,
                            _CPWindowViewCornerResizeRectWidth + CPWindowResizeSlop);
 
-    if (_CGRectContainsPoint(rect, aPoint))
-        return _CPWindowViewResizeRegionTopLeft;
+        if (_CGRectContainsPoint(rect, aPoint))
+            return _CPWindowViewResizeRegionTopLeft;
 
-    rect.origin.x = _CGRectGetMaxX(frame) - _CPWindowViewCornerResizeRectWidth;
+        rect.origin.x = _CGRectGetMaxX(frame) - _CPWindowViewCornerResizeRectWidth;
 
-    if (_CGRectContainsPoint(rect, aPoint))
-        return _CPWindowViewResizeRegionTopRight;
+        if (_CGRectContainsPoint(rect, aPoint))
+            return _CPWindowViewResizeRegionTopRight;
 
-    rect.origin.y = _CGRectGetMaxY(frame) - _CPWindowViewCornerResizeRectWidth;
+        rect.origin.y = _CGRectGetMaxY(frame) - _CPWindowViewCornerResizeRectWidth;
 
-    if (_CGRectContainsPoint(rect, aPoint))
-        return _CPWindowViewResizeRegionBottomRight;
+        if (_CGRectContainsPoint(rect, aPoint))
+            return _CPWindowViewResizeRegionBottomRight;
 
-    rect.origin.x = frame.origin.x - CPWindowResizeSlop;
+        rect.origin.x = frame.origin.x - CPWindowResizeSlop;
 
-    if (_CGRectContainsPoint(rect, aPoint))
-        return _CPWindowViewResizeRegionBottomLeft;
+        if (_CGRectContainsPoint(rect, aPoint))
+            return _CPWindowViewResizeRegionBottomLeft;
 
-    rect = _CGRectMake(rect.origin.x,
-                       frame.origin.y + _CPWindowViewCornerResizeRectWidth,
-                       CPWindowResizeSlop * 2,
-                       _CGRectGetHeight(frame) - (_CPWindowViewCornerResizeRectWidth * 2));
+        rect = _CGRectMake(rect.origin.x,
+                           frame.origin.y + _CPWindowViewCornerResizeRectWidth,
+                           CPWindowResizeSlop * 2,
+                           _CGRectGetHeight(frame) - (_CPWindowViewCornerResizeRectWidth * 2));
 
-    if (_CGRectContainsPoint(rect, aPoint))
-        return _CPWindowViewResizeRegionLeft;
+        if (_CGRectContainsPoint(rect, aPoint))
+            return _CPWindowViewResizeRegionLeft;
 
-    rect.origin.x = _CGRectGetMaxX(frame) - CPWindowResizeSlop;
+        rect.origin.x = _CGRectGetMaxX(frame) - CPWindowResizeSlop;
 
-    if (_CGRectContainsPoint(rect, aPoint))
-        return _CPWindowViewResizeRegionRight;
+        if (_CGRectContainsPoint(rect, aPoint))
+            return _CPWindowViewResizeRegionRight;
 
-    rect = _CGRectMake(frame.origin.x + _CPWindowViewCornerResizeRectWidth,
-                       frame.origin.y - CPWindowResizeSlop,
-                       _CGRectGetWidth(frame) - (_CPWindowViewCornerResizeRectWidth * 2),
-                       CPWindowResizeSlop * 2);
+        rect = _CGRectMake(frame.origin.x + _CPWindowViewCornerResizeRectWidth,
+                           frame.origin.y - CPWindowResizeSlop,
+                           _CGRectGetWidth(frame) - (_CPWindowViewCornerResizeRectWidth * 2),
+                           CPWindowResizeSlop * 2);
 
-    if (_CGRectContainsPoint(rect, aPoint))
-        return _CPWindowViewResizeRegionTop;
+        if (_CGRectContainsPoint(rect, aPoint))
+            return _CPWindowViewResizeRegionTop;
 
-    rect.origin.y = _CGRectGetMaxY(frame) - CPWindowResizeSlop;
+        rect.origin.y = _CGRectGetMaxY(frame) - CPWindowResizeSlop;
 
-    if (_CGRectContainsPoint(rect, aPoint))
-        return _CPWindowViewResizeRegionBottom;
+        if (_CGRectContainsPoint(rect, aPoint))
+            return _CPWindowViewResizeRegionBottom;
+    }
 
     return _CPWindowViewResizeRegionNone;
 }
@@ -268,12 +314,15 @@ var _CPWindowViewResizeIndicatorImage = nil,
 */
 - (void)setCursorForLocation:(CGPoint)aPoint resizing:(BOOL)isResizing
 {
-    if (!(_styleMask & CPResizableWindowMask) ||
+    var theWindow = [self window];
+
+    if ([theWindow isFullPlatformWindow] ||
+        !(_styleMask & CPResizableWindowMask) ||
         (CPWindowResizeStyle !== CPWindowResizeStyleModern))
         return;
 
-    var theWindow = [self window],
-        resizeRegion = isResizing ? _resizeRegion : [self resizeRegionForPoint:[theWindow convertBaseToGlobal:aPoint]],
+    var globalPoint = [theWindow convertBaseToGlobal:aPoint],
+        resizeRegion = isResizing ? _resizeRegion : [self resizeRegionForPoint:globalPoint],
         minSize = nil,
         maxSize = nil,
         frameSize;
@@ -301,6 +350,8 @@ var _CPWindowViewResizeIndicatorImage = nil,
                 [[CPCursor resizeUpCursor] set];
             else if (maxSize && (frameSize.height === maxSize.height))
                 [[CPCursor resizeDownCursor] set];
+            else if ([CPMenu menuBarVisible] && (_CGRectGetMinY([theWindow frame]) <= [CPMenu menuBarHeight]))
+                [[CPCursor resizeDownCursor] set];
             else
                 [[CPCursor resizeNorthSouthCursor] set];
             break;
@@ -390,6 +441,7 @@ var _CPWindowViewResizeIndicatorImage = nil,
             newY = _CGRectGetMinY(_resizeFrame),
             newWidth = _CGRectGetWidth(_resizeFrame),
             newHeight = _CGRectGetHeight(_resizeFrame),
+            platformFrame = [[theWindow platformWindow] usableContentFrame],
             minSize = [theWindow minSize],
             maxSize = [theWindow maxSize];
 
@@ -440,7 +492,10 @@ var _CPWindowViewResizeIndicatorImage = nil,
         if (theWindow._isSheet && theWindow._parentView && (frame.size.width !== newWidth))
             [theWindow._parentView _setAttachedSheetFrameOrigin];
 
-        [theWindow setFrame:_CGRectMake(newX, newY, newWidth, newHeight)];
+        // Constrain resize to fit within the platform window.
+        var newFrame = CGRectIntersection(_CGRectMake(newX, newY, newWidth, newHeight), platformFrame);
+
+        [theWindow setFrame:newFrame];
         [self setCursorForLocation:location resizing:YES];
     }
 
@@ -463,7 +518,7 @@ var _CPWindowViewResizeIndicatorImage = nil,
     if ([CPMenu menuBarVisible])
         minPointY = [[CPApp mainMenu] menuBarHeight];
 
-    var restrictedPoint = CGPointMake(0, 0);
+    var restrictedPoint = _CGPointMake(0, 0);
 
     restrictedPoint.x = MIN(MAX(aPoint.x, -_frame.size.width + 4.0), _CGRectGetMaxX(visibleFrame) - 4.0);
     restrictedPoint.y = MIN(MAX(aPoint.y, minPointY), _CGRectGetMaxY(visibleFrame) - 8.0);
@@ -493,8 +548,8 @@ var _CPWindowViewResizeIndicatorImage = nil,
         var theWindow = [self window],
             frame = [theWindow frame],
             location = [theWindow convertBaseToGlobal:[anEvent locationInWindow]],
-            origin = [self _pointWithinScreenFrame:CGPointMake(_CGRectGetMinX(frame) + (location.x - _mouseDraggedPoint.x),
-                                                               _CGRectGetMinY(frame) + (location.y - _mouseDraggedPoint.y))];
+            origin = [self _pointWithinScreenFrame:_CGPointMake(_CGRectGetMinX(frame) + (location.x - _mouseDraggedPoint.x),
+                                                                _CGRectGetMinY(frame) + (location.y - _mouseDraggedPoint.y))];
         [theWindow setFrameOrigin:origin];
 
         _mouseDraggedPoint = [self _pointWithinScreenFrame:location];
@@ -543,7 +598,7 @@ var _CPWindowViewResizeIndicatorImage = nil,
 
 - (void)setResizeIndicatorOffset:(CGSize)anOffset
 {
-    if (CGSizeEqualToSize(_resizeIndicatorOffset, anOffset))
+    if (_CGSizeEqualToSize(_resizeIndicatorOffset, anOffset))
         return;
 
     _resizeIndicatorOffset = anOffset;
@@ -554,7 +609,7 @@ var _CPWindowViewResizeIndicatorImage = nil,
     var size = [_resizeIndicator frame].size,
         boundsSize = [self frame].size;
 
-    [_resizeIndicator setFrameOrigin:CGPointMake(boundsSize.width - size.width - anOffset.width, boundsSize.height - size.height - anOffset.height)];
+    [_resizeIndicator setFrameOrigin:_CGPointMake(boundsSize.width - size.width - anOffset.width, boundsSize.height - size.height - anOffset.height)];
 }
 
 - (CGSize)resizeIndicatorOffset
@@ -617,7 +672,7 @@ var _CPWindowViewResizeIndicatorImage = nil,
         var size = [_resizeIndicator frame].size,
             boundsSize = [self bounds].size;
 
-        [_resizeIndicator setFrameOrigin:CGPointMake(boundsSize.width - size.width - _resizeIndicatorOffset.width, boundsSize.height - size.height - _resizeIndicatorOffset.height)];
+        [_resizeIndicator setFrameOrigin:_CGPointMake(boundsSize.width - size.width - _resizeIndicatorOffset.width, boundsSize.height - size.height - _resizeIndicatorOffset.height)];
     }
 }
 

AppKit/Cib/_CPCibWindowTemplate.j

@@ -76,6 +76,7 @@ CPWindowPositionFlexibleTop                  = 1 << 22;
 
     if (_minSize)
         [theWindow setMinSize:_minSize];
+
     if (_maxSize)
         [theWindow setMaxSize:_maxSize];
 

AppKit/Platform/DOM/CPPlatformWindow+DOM.j

@@ -1177,7 +1177,6 @@ var resizeTimer = nil;
 {
     var type = _overriddenEventType || aDOMEvent.type;
 
-
     // IE's event order is down, up, up, dblclick, so we have create these events artificially.
     if (type === @"dblclick")
     {
@@ -1308,6 +1307,7 @@ var resizeTimer = nil;
     // if there are any tracking event listeners then show the event guard so we don't lose events to iframes
     // TODO Actually check for tracking event listeners, not just any listener but _CPRunModalLoop.
     var hasTrackingEventListener = NO;
+
     for (var i = 0; i < CPApp._eventListeners.length; i++)
     {
         if (CPApp._eventListeners[i]._callback !== _CPRunModalLoop)
@@ -1316,6 +1316,7 @@ var resizeTimer = nil;
             break;
         }
     }
+
     _lastMouseEventLocation = location;
 
     _DOMEventGuard.style.display = hasTrackingEventListener ? "" : "none";

AppKit/Themes/Aristo/Info.plist

@@ -7,7 +7,7 @@
 	<key>CPBundleName</key>
 	<string>Aristo</string>
 	<key>BKLearnMoreURL</key>
-	<string>http://cappuccino.org/aristo</string>
+	<string>http://cappuccino-project.org/aristo</string>
 	<key>BKLearnMoreButtonTitle</key>
 	<string>Aristo Home Page</string>
 	<key>CPPrincipalClass</key>

AppKit/Themes/Aristo/index-debug.html

@@ -19,7 +19,7 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src = "Frameworks/Debug/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -46,12 +46,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading Aristo...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

AppKit/Themes/Aristo/index.html

@@ -18,7 +18,7 @@
         <script type = "text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -45,12 +45,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading Aristo...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

AppKit/_CPAttachedWindow.j

@@ -389,6 +389,14 @@ var _CPAttachedWindow_attachedWindowShouldClose_    = 1 << 0,
     return YES;
 }
 
+/*!
+    Normally untitled windows cannot become main, but popovers can.
+*/
+- (BOOL)canBecomeMainWindow
+{
+    return [self isVisible];
+}
+
 /*!
     Called when the window is losing focus.
 */

AppKit/_CPAutocompleteMenu.j

@@ -38,7 +38,6 @@ var _CPAutocompleteMenuMaximumHeight = 307;
     float           widestItemWidth;
 
     CPWindow        _menuWindow;
-    CPWindow        _parentWindow @accessors(property=parentWindow);
     CPScrollView    scrollView;
     CPTableView     tableView;
 
@@ -49,8 +48,7 @@ var _CPAutocompleteMenuMaximumHeight = 307;
 {
     if (self = [super init])
     {
-        [self bind:@"parentWindow" toObject:self withKeyPath:@"textField.window" options:nil];
-        [self setTextField:aTextField];
+        textField = aTextField;
 
         _menuWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(0, 0, 100, 100) styleMask:CPBorderlessWindowMask];
 
@@ -187,7 +185,7 @@ var _CPAutocompleteMenuMaximumHeight = 307;
 {
     var indexOfSelectedItem = [self indexOfSelectedItem];
 
-    [self setContentArray:[textField _completionsForSubstring:[textField _editorValue] indexOfToken:0 indexOfSelectedItem:indexOfSelectedItem]];
+    [self setContentArray:[textField _completionsForSubstring:[textField _inputElement].value indexOfToken:0 indexOfSelectedItem:indexOfSelectedItem]];
 
     if (![contentArray count])
         return;
@@ -260,25 +258,6 @@ var _CPAutocompleteMenuMaximumHeight = 307;
     [textField _complete:self];
 }
 
-- (void)setParentWindow:(CPWindow)aWindow
-{
-    if (aWindow === _parentWindow)
-        return;
-
-    if (_parentWindow)
-        [[CPNotificationCenter defaultCenter] removeObserver:self];
-
-    _parentWindow = aWindow;
-
-    if (_parentWindow)
-        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(parentWindowWillClose:) name:CPWindowWillCloseNotification object:_parentWindow];
-}
-
-- (void)parentWindowWillClose:(CPNotification)aNotification
-{
-    [self _hideCompletions];
-}
-
 @end
 
 

AppKit/_CPToolTip.j

@@ -197,7 +197,7 @@ var _CPToolTipHeight = 24.0,
 - (void)showToolTip
 {
     var mousePosition = [[CPApp currentEvent] globalLocation],
-        nativeRect = [[[CPApp mainWindow] platformWindow] nativeContentRect];
+        nativeRect = [[CPPlatformWindow primaryPlatformWindow] nativeContentRect];
 
     mousePosition.y += 20;
 

Foundation/CPIndexSet.j

@@ -21,6 +21,7 @@
  */
 
 #include "CPRange.h"
+#include "Foundation.h"
 
 @import "CPArray.j"
 @import "CPObject.j"
@@ -79,6 +80,10 @@
 */
 - (id)initWithIndex:(CPInteger)anIndex
 {
+    if (!_IS_NUMERIC(anIndex))
+        [CPException raise:CPInvalidArgumentException
+                    reason:"Invalid index"];
+
     return [self initWithIndexesInRange:_CPMakeRange(anIndex, 1)];
 }
 

Foundation/CPRunLoop.j

@@ -375,7 +375,14 @@ var CPRunLoopLastNativeRunLoop = 0;
 
         //initiate a new window.setTimeout if there are any timers
         if (_nextTimerFireDatesForModes[aMode] !== nil)
-            _nativeTimersForModes[aMode] = window.setNativeTimeout(function() { _effectiveDate = nextFireDate; _nativeTimersForModes[aMode] = nil; ++CPRunLoopLastNativeRunLoop; [self limitDateForMode:aMode]; _effectiveDate = nil; }, MAX(0, [nextFireDate timeIntervalSinceNow] * 1000));
+            _nativeTimersForModes[aMode] = window.setNativeTimeout(function()
+                {
+                    _effectiveDate = nextFireDate;
+                    _nativeTimersForModes[aMode] = nil;
+                    ++CPRunLoopLastNativeRunLoop;
+                    [self limitDateForMode:aMode];
+                    _effectiveDate = nil;
+                }, MAX(0, [nextFireDate timeIntervalSinceNow] * 1000));
     }
 
     // Run loop performers

Foundation/CPTimer.j

@@ -245,13 +245,27 @@ var _CPTimerBridgeTimer = function(codeOrFunction, aDelay, shouldRepeat, functio
         theFunction = nil;
 
     if (typeof codeOrFunction === "string")
-        theFunction = function() { new Function(codeOrFunction)(); if (!shouldRepeat) CPTimersForTimeoutIDs[timeoutID] = nil; }
+    {
+        theFunction = function()
+        {
+            new Function(codeOrFunction)();
+
+            if (!shouldRepeat)
+                CPTimersForTimeoutIDs[timeoutID] = nil;
+        }
+    }
     else
     {
         if (!functionArgs)
             functionArgs = [];
 
-        theFunction = function() { codeOrFunction.apply(window, functionArgs); if (!shouldRepeat) CPTimersForTimeoutIDs[timeoutID] = nil; }
+        theFunction = function()
+        {
+            codeOrFunction.apply(window, functionArgs);
+
+            if (!shouldRepeat)
+                CPTimersForTimeoutIDs[timeoutID] = nil;
+        }
     }
 
     // A call such as setTimeout(f) is technically invalid but browsers seem to treat it as setTimeout(f, 0), so so will we.

Foundation/CPURL.j

@@ -254,8 +254,8 @@ var CPURLURLStringKey   = @"CPURLURLStringKey",
 
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
-    [aCoder encodeObject:_baseURL forKey:CPURLBaseURLKey];
-    [aCoder encodeObject:_string forKey:CPURLURLStringKey];
+    [aCoder encodeObject:self._baseURL forKey:CPURLBaseURLKey];
+    [aCoder encodeObject:self._string forKey:CPURLURLStringKey];
 }
 
 @end

Foundation/CPURLConnection.j

@@ -250,6 +250,7 @@ var CPURLConnectionDelegate = nil;
                 {
                     var response = [[CPHTTPURLResponse alloc] initWithURL:URL];
                     [response _setStatusCode:statusCode];
+                    [response _setAllResponseHeaders:_HTTPRequest.getAllResponseHeaders()];
                     [_delegate connection:self didReceiveResponse:response];
                 }
             }

Foundation/CPURLResponse.j

@@ -72,11 +72,34 @@ URL
 */
 @implementation CPHTTPURLResponse : CPURLResponse
 {
-    int _statusCode;
+    int             _statusCode;
+    CPString        _allResponseHeaders;
+    CPDictionary    _responseHeaders;
+}
+
++ (CPDictionary)parseHTTPHeaders:(CPString)headersString
+{
+    var r = [CPMutableDictionary dictionary];
+
+    if (headersString)
+    {
+        var headerLines = headersString.split('\r\n'),
+            count = headerLines.length;
+
+        while (count--)
+        {
+            var headerLine = headerLines[count],
+                index = headerLine.indexOf(': ');
+            if (index !== CPNotFound)
+                [r setValue:headerLine.substring(index + 2) forKey:headerLine.substring(0, index)];
+        }
+    }
+
+    return r;
 }
 
 /* @ignore */
-- (id)_setStatusCode:(int)aStatusCode
+- (void)_setStatusCode:(int)aStatusCode
 {
     _statusCode = aStatusCode;
 }
@@ -89,4 +112,21 @@ URL
     return _statusCode;
 }
 
+- (void)_setAllResponseHeaders:(CPString)responseHeadersString
+{
+    _allResponseHeaders = responseHeadersString;
+}
+
+/*!
+    Return the HTTP response headers.
+*/
+- (CPDictionary)allHeaderFields
+{
+    // Lazily parse the headers.
+    if (!_responseHeaders)
+        _responseHeaders = [[self class] parseHTTPHeaders:_allResponseHeaders];
+
+    return _responseHeaders;
+}
+
 @end

Jakefile

@@ -263,7 +263,7 @@ task ("demos", function()
     rm_rf(demosDir);
     FILE.mkdirs(demosDir);
 
-    OS.system("curl -L http://github.com/280north/cappuccino-demos/zipball/master > " + zipQuoted);
+    OS.system("curl -L http://github.com/cappuccino/cappuccino-demos/zipball/master > " + zipQuoted);
     OS.system("(cd " + demosQuoted + " && unzip " + zipQuoted + " -d demos)");
 
     require("objective-j");

Objective-J/Jakefile

@@ -111,7 +111,7 @@ function environmentFlags()
 
 var SHRINKSAFE = require("minify/shrinksafe");
 function compressor(code) {
-    return SHRINKSAFE.compress(code, { charset : "UTF-8", useServer : true });
+    return SHRINKSAFE.compress(code, { charset : "UTF-16", useServer : true });
 }
 
 function gcc(inputFilePath, outputFilePath, flags, compress)

README.markdown

@@ -13,7 +13,7 @@ with the complexities of traditional web technologies like HTML, CSS, or even
 the DOM. The unpleasantries of building complex cross browser applications are
 abstracted away for you.
 
-For more information, see <http://cappuccino.org>.
+For more information, see <http://cappuccino-project.org>.
 
 System Requirements
 -------------------
@@ -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.6-RC2/bootstrap.sh >/tmp/cappuccino_bootstrap.sh && bash /tmp/cappuccino_bootstrap.sh
+    $ curl https://raw.github.com/cappuccino/cappuccino/v0.9.6/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.
 
@@ -65,8 +65,8 @@ Getting Help
 ------------
 If you need help with Cappuccino, you can get help from the following sources:
 
-  - [FAQ](http://cappuccino.org/discuss/faq.php)
-  - [Documentation](http://cappuccino.org/learn/)
+  - [FAQ](http://cappuccino-project.org/support/faq.html)
+  - [Documentation](http://cappuccino-project.org/learn/)
   - [Wiki](http://github.com/cappuccino/cappuccino/wikis)
   - Mailing Lists:
     - [Objective-J](http://groups.google.com/group/objectivej)

Tests/AppKit/CPApplicationTest.j

@@ -90,11 +90,11 @@ var globalResults = [];
 
 - (void)testRunModalForWindow
 {
-    var aWindow = [[CPWindow alloc] init];
-    [app runModalForWindow:aWindow];
+    var modalWindow = [[CPWindow alloc] init];
+    [app runModalForWindow:modalWindow];
 
-    [self assertTrue:[aWindow isKeyWindow] message:@"A window must be made key when it's run modally"];
-    [self assertFalse:[aWindow isMainWindow] message:@"A window must not become the main window when it's run modally"];
+    [self assertTrue:[modalWindow isKeyWindow] message:@"A window must be made key when it's run modally"];
+    [self assertFalse:[modalWindow isMainWindow] message:@"A window must not become the main window when it's run modally"];
 
     [app abortModal];
 }

Tests/AppKit/CPButtonTest.j

@@ -181,7 +181,7 @@
 
 - (void)testTypeMasks
 {
-    var button = [[CPButton alloc] initWithFrame:CGRectMakeZero()];
+    button = [[CPButton alloc] initWithFrame:CGRectMakeZero()];
 
     // The default mask should be that of CPMomentaryPushInButton.
     [self assert:CPPushInButtonMask | CPGrayButtonMask | CPBackgroundButtonMask equals:[button highlightsBy]];

Tests/AppKit/CPKeyValueBindingTest.j

@@ -154,8 +154,9 @@
 - (void)testTableColumn
 {
     var tableView = [CPTableView new],
-        tableColumn = [[CPTableColumn alloc] initWithIdentifier:"A Column"],
-        arrayController = [CPArrayController new];
+        tableColumn = [[CPTableColumn alloc] initWithIdentifier:"A Column"];
+
+    arrayController = [CPArrayController new];
 
     [tableView addTableColumn:tableColumn];
 
@@ -401,4 +402,4 @@
     return valueB;
 }
 
-@end
+@end

Tests/AppKit/CPTableViewTest.j

@@ -243,9 +243,10 @@
 - (void)testContentBinding
 {
     var contentBindingTable = [[CPTableView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)],
-        tableColumn = [[CPTableColumn alloc] initWithIdentifier:@"A"],
         delegate = [ContentBindingTableDelegate new];
 
+    tableColumn = [[CPTableColumn alloc] initWithIdentifier:@"A"];
+
     [contentBindingTable addTableColumn:tableColumn];
     [delegate setTester:self];
     [contentBindingTable setDelegate:delegate];

Tests/AppKit/CPTokenFieldTest.j

@@ -28,53 +28,4 @@
     [[aWindow contentView] addSubview:tokenField];
 }
 
-- (void)testCloseParentWindow
-{
-    var aWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(0.0, 0.0, 1024.0, 768.0) styleMask:CPTitledWindowMask],
-        tokenField = [[CPTokenField alloc] initWithFrame:CGRectMake(10, 10, 100, 28)];
-
-    [[aWindow contentView] addSubview:tokenField];
-    [tokenField setEnabled:YES];
-    [tokenField setEditable:YES];
-
-    [aWindow makeKeyAndOrderFront:nil];
-
-    // Start autocomplete.
-    var tokenDelegate = [TokenFieldDelegate new];
-    [tokenDelegate setCompletions:[@"Tokyo", @"Toronto", @"Gothenburg", @"London"]];
-    [tokenField setDelegate:tokenDelegate];
-
-    [tokenField setStringValue:@"To"];
-    // Start autocomplete programmatically.
-    [aWindow makeFirstResponder:tokenField];
-    [[tokenField _autocompleteMenu] _showCompletions:nil];
-
-    // Verify we're now autocompleting.
-    [self assertTrue:[[tokenField _autocompleteMenu]._menuWindow isVisible] message:@"autocomplete visible"];
-
-    [aWindow close];
-    [self assertFalse:[[tokenField _autocompleteMenu]._menuWindow isVisible] message:@"autocomplete not visible when token field window closes"];
-}
-
-@end
-
-@implementation TokenFieldDelegate : CPObject
-{
-    CPArray completions @accessors;
-}
-
-- (CPArray)tokenField:(CPTokenField)aTokenField completionsForSubstring:(CPString)substring indexOfToken:(int)tokenIndex indexOfSelectedItem:(int)selectedIndex
-{
-    var r = [];
-
-    if (!substring)
-        return completions;
-
-    for (var i = 0; i < completions.length; i++)
-        if (completions[i].toLowerCase().indexOf(completions.toLowerCase()) == 0)
-            r.push(completions[i]);
-
-    return r;
-}
-
 @end

Tests/AppKit/CPWindowTest.j

@@ -19,12 +19,11 @@
     [self assertTrue:!![self window]];
 }
 
-- (void)testThatContentViewIsInitialFirstResponder
+- (void)testThatNilIsInitialFirstResponder
 {
-    var contentView = [[self window] contentView];
-    [self assert:contentView
+    [self assert:nil
           equals:[[self window] initialFirstResponder]
-         message:@"The window's content view must be the initial first responder"];
+         message:@"The initial first responder must be null"];
 }
 
 - (void)testKeyViewLoop
@@ -34,11 +33,11 @@
 
     [textField setFrame:CGRectMake(100.0, 100.0, 100.0, 26.0)];
     [contentView addSubview:textField];
-    [[self window] recalculateKeyViewLoop];
 
     var nextTextField = [CPTextField textFieldWithStringValue:@"" placeholder:@"" width:100];
     [nextTextField setFrame:CGRectMake(100.0, 200.0, 100.0, 26.0)];
     [contentView addSubview:nextTextField];
+
     [[self window] recalculateKeyViewLoop];
 
     // Test nextKeyView

Tests/AppKit/WithAndWithoutBindingsIntegration/01_WithoutBindings/WithoutBindingsTest.j

@@ -75,9 +75,9 @@
     [theDocument.selectedBookmarkTitleField performClick:self];
     [self assert:@"Another Title" equals:[theDocument.collection[1] title]];
 
-    [theDocument.selectedBookmarkURLField setStringValue:@"http://www.cappuccino.org"];
+    [theDocument.selectedBookmarkURLField setStringValue:@"http://www.cappuccino-project.org"];
     [theDocument.selectedBookmarkURLField performClick:self];
-    [self assert:[CPURL URLWithString:@"http://www.cappuccino.org"] equals:[theDocument.collection[1] URL]];
+    [self assert:[CPURL URLWithString:@"http://www.cappuccino-project.org"] equals:[theDocument.collection[1] URL]];
 
     // Verify the first entry remains.
     [theDocument.tableView selectRowIndexes:[CPIndexSet indexSetWithIndex:0] byExtendingSelection:NO]
@@ -87,7 +87,7 @@
     // Remove it.
     [theDocument removeSelectedBookmarks:self];
     [self assert:@"Another Title" equals:[theDocument.selectedBookmarkTitleField stringValue]];
-    [self assert:@"http://www.cappuccino.org" equals:[theDocument.selectedBookmarkURLField stringValue]];
+    [self assert:@"http://www.cappuccino-project.org" equals:[theDocument.selectedBookmarkURLField stringValue]];
 }
 
-@end
+@end

Tests/AppKit/WithAndWithoutBindingsIntegration/02_WithBindings/WithBindingsTest.j

@@ -75,9 +75,9 @@
     [theDocument.selectedBookmarkTitleField performClick:self];
     [self assert:@"Another Title" equals:[theDocument.collection[1] title]];
 
-    [theDocument.selectedBookmarkURLField setStringValue:@"http://www.cappuccino.org"];
+    [theDocument.selectedBookmarkURLField setStringValue:@"http://www.cappuccino-project.org"];
     [theDocument.selectedBookmarkURLField performClick:self];
-    [self assert:[CPURL URLWithString:@"http://www.cappuccino.org"] equals:[theDocument.collection[1] URL]];
+    [self assert:[CPURL URLWithString:@"http://www.cappuccino-project.org"] equals:[theDocument.collection[1] URL]];
 
     // Verify the first entry remains.
     [theDocument.tableView selectRowIndexes:[CPIndexSet indexSetWithIndex:0] byExtendingSelection:NO]
@@ -87,7 +87,7 @@
     // Remove it.
     [theDocument.removeButton performClick:self];
     [self assert:@"Another Title" equals:[theDocument.selectedBookmarkTitleField stringValue]];
-    [self assert:@"http://www.cappuccino.org" equals:[theDocument.selectedBookmarkURLField stringValue]];
+    [self assert:@"http://www.cappuccino-project.org" equals:[theDocument.selectedBookmarkURLField stringValue]];
 }
 
-@end
+@end

Tests/Foundation/CPIndexSetTest.j

@@ -202,6 +202,7 @@ function descriptionWithoutEntity(aString)
     [self assertTrue:[[CPIndexSet indexSetWithIndex:1] containsIndex:1]];
     [self assertTrue:[[CPIndexSet indexSetWithIndex:0] containsIndex:0]];
     [self assertFalse:[[CPIndexSet indexSetWithIndex:0] containsIndex:1]];
+    [self assertThrows:function() { [CPIndexSet indexSetWithIndex:NaN] }];
 }
 
 - (void)testIndexSetWithIndexesInRange

Tests/Foundation/CPKVOTest.j

@@ -65,7 +65,7 @@
 
 - (void)testDirectIVarObservation
 {
-    var bob = [[PersonTester alloc] init];
+    bob = [[PersonTester alloc] init];
 
     [bob addObserver:self forKeyPath:@"phoneNumber" options:nil context:@"testDirectIVarObservation"];
 
@@ -446,8 +446,9 @@
 
 - (void)testSettersReplacedOnce
 {
-    var bob = [[PersonTester alloc] init],
-        betty = [CPObject new];
+    var betty = [CPObject new];
+
+    bob = [[PersonTester alloc] init];
 
     [bob addObserver:self forKeyPath:@"name" options:nil context:@"testSettersReplacedOnce"];
 
@@ -470,7 +471,7 @@
 
 - (void)testNestedNotifications
 {
-    var bob = [[PersonTester alloc] init];
+    bob = [[PersonTester alloc] init];
 
     [bob willChangeValueForKey:@"name"];
     [self assertTrue:bob._willChangeMessageCounter[@"name"] === 1];

Tests/Foundation/CPSetTest.j

@@ -4,7 +4,6 @@
 
 @implementation CPSetTest : OJTestCase
 {
-    CPSet set;
 }
 
 - (void)assertSet:(CPSet)aSet onlyHasObjects:(CPArray)objects

Tests/Foundation/CPURLConnectionTest.j

@@ -0,0 +1,22 @@
+@import <Foundation/CPURLResponse.j>
+
+@implementation CPURLConnectionTest : OJTestCase
+{
+}
+
+- (void)testParseHTTPHeaders
+{
+    var testHeader = "Server: gunicorn/0.17.1\r\nDate: Fri, 11 Jan 2013 10:32:43 GMT\r\nConnection: close\r\nTransfer-Encoding: chunked\r\nVary: Accept, Cookie\r\nContent-Type: application/json; charset=utf-8\r\nCache-Control: no-cache\r\n",
+        parsed = [CPHTTPURLResponse parseHTTPHeaders:testHeader];
+
+    [self assert:@"gunicorn/0.17.1" equals:[parsed valueForKey:@"Server"]];
+    [self assert:@"Fri, 11 Jan 2013 10:32:43 GMT" equals:[parsed valueForKey:@"Date"]];
+    [self assert:@"close" equals:[parsed valueForKey:@"Connection"]];
+    [self assert:@"chunked" equals:[parsed valueForKey:@"Transfer-Encoding"]];
+    [self assert:@"Accept, Cookie" equals:[parsed valueForKey:@"Vary"]];
+    [self assert:@"application/json; charset=utf-8" equals:[parsed valueForKey:@"Content-Type"]];
+    [self assert:@"no-cache" equals:[parsed valueForKey:@"Cache-Control"]];
+    [self assert:7 equals:[[parsed allKeys] count]];
+}
+
+@end

Tests/Foundation/CPURLTest.j

@@ -3,7 +3,7 @@
 var exampleProtocol = "http",
     exampleUser = "foo",
     examplePassword = "bar",
-    exampleHost = "cappuccino.org",
+    exampleHost = "cappuccino-project.org",
     examplePort = 80,
     exampleAuthority = exampleUser + ":" + examplePassword + "@" + exampleHost + ":" + examplePort,
     examplePathBase = "/contribute/",
@@ -128,10 +128,10 @@ var exampleProtocol = "http",
 
 - (void)testIsEqual
 {
-    var url = [CPURL URLWithString:@"http://www.cappuccino.org"],
-        url2 = [CPURL URLWithString:@"http://www.cappuccino.org"],
-        url3 = [CPURL URLWithString:@"http://www.cappuccino.org/index.html"],
-        url4 = [CPURL URLWithString:@"http://www.cappuccino.org//index.html"];
+    var url = [CPURL URLWithString:@"http://www.cappuccino-project.org"],
+        url2 = [CPURL URLWithString:@"http://www.cappuccino-project.org"],
+        url3 = [CPURL URLWithString:@"http://www.cappuccino-project.org/index.html"],
+        url4 = [CPURL URLWithString:@"http://www.cappuccino-project.org//index.html"];
 
     [self assert:url equals:url];
     [self assert:url equals:url2];
@@ -142,9 +142,9 @@ var exampleProtocol = "http",
 
 - (void)testIsEqualToURL
 {
-    var url = [CPURL URLWithString:@"http://www.cappuccino.org"],
-        url2 = [CPURL URLWithString:@"http://www.cappuccino.org"],
-        url3 = [CPURL URLWithString:@"http://www.cappuccino.org/index.html"];
+    var url = [CPURL URLWithString:@"http://www.cappuccino-project.org"],
+        url2 = [CPURL URLWithString:@"http://www.cappuccino-project.org"],
+        url3 = [CPURL URLWithString:@"http://www.cappuccino-project.org/index.html"];
 
     [self assertTrue:[url isEqualToURL:url]];
     [self assertTrue:[url isEqualToURL:url2]];

Tests/Foundation/CPUserDefaultsTest.j

@@ -102,13 +102,13 @@ CPUserDefaultsTestKey2 = @"KEY2";
 
 - (void)testURL
 {
-    [target setURL:[CPURL URLWithString:@"http://cappuccino.org"] forKey:CPUserDefaultsTestKey1];
+    [target setURL:[CPURL URLWithString:@"http://cappuccino-project.org"] forKey:CPUserDefaultsTestKey1];
     [self assert:[[target URLForKey:CPUserDefaultsTestKey1] class] equals:CPURL];
-    [self assert:[[target URLForKey:CPUserDefaultsTestKey1] absoluteString] equals:@"http://cappuccino.org"];
+    [self assert:[[target URLForKey:CPUserDefaultsTestKey1] absoluteString] equals:@"http://cappuccino-project.org"];
 
-    [target setURL:@"http://cappuccino.org" forKey:CPUserDefaultsTestKey1];
+    [target setURL:@"http://cappuccino-project.org" forKey:CPUserDefaultsTestKey1];
     [self assert:[[target URLForKey:CPUserDefaultsTestKey1] class] equals:CPURL];
-    [self assert:[[target URLForKey:CPUserDefaultsTestKey1] absoluteString] equals:@"http://cappuccino.org"];
+    [self assert:[[target URLForKey:CPUserDefaultsTestKey1] absoluteString] equals:@"http://cappuccino-project.org"];
 
     [target removeObjectForKey:CPUserDefaultsTestKey1];
     [self assert:[target URLForKey:CPUserDefaultsTestKey1] equals:nil];
@@ -152,4 +152,4 @@ CPUserDefaultsTestKey2 = @"KEY2";
    lastObservedCPUserDefaultsTestKey1 = [target objectForKey:CPUserDefaultsTestKey1];
 }
 
-@end
+@end

Tests/Manual/ArrayController1/index-debug.html

@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/ArrayController1/index.html

@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/ArrayControllerRemovingFirstTest/index-debug.html

@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/ArrayControllerRemovingFirstTest/index.html

@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/AttachedSheet/index-debug.html

@@ -19,19 +19,19 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src = "Frameworks/Debug/Objective-J/Objective-J.js" type = "text/javascript"></script>
        <script type = "text/javascript">
             objj_msgSend_reset();
-            
+
             // DEBUG OPTIONS:
-            
+
             // Uncomment to enable printing of backtraces on exceptions:
             objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to enable runtime type checking:
             objj_msgSend_decorate(objj_typecheck_decorator);
-            
+
             // Uncomment (along with both above) to print backtraces on type check errors:
             objj_typecheck_prints_backtrace = true;
         </script>
@@ -60,12 +60,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading Attached Sheet...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/AttachedSheet/index.html

@@ -18,7 +18,7 @@
         <script type = "text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -45,12 +45,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading <i>Attached Sheet</i> …</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/AttachedSheet2/index-debug.html

@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/AttachedSheet2/index.html

@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/Bindings/index-debug.html

@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/Bindings/index.html

@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPAlertTest/index-debug.html

@@ -26,9 +26,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPAlertTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPAlertTest/index.html

@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPAlertTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPBinder-echo-bug/index-debug.html

@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPBinder-echo-bug/index.html

@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPBoxTest/index-debug.html

@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPBoxTest/index.html

@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPBrowserTest/AppController.j

@@ -126,7 +126,7 @@
 
 - (id)browser:(id)aBrowser imageValueForItem:(id)anItem
 {
-    return [[CPImage alloc] initWithContentsOfFile:"http://cappuccino.org/images/favicon.png" size:CGSizeMake(16, 16)];
+    return [[CPImage alloc] initWithContentsOfFile:"http://cappuccino-project.org/images/favicon.png" size:CGSizeMake(16, 16)];
 }
 
 - (id)browser:(id)aBrowser objectValueForItem:(id)anItem

Tests/Manual/CPBrowserTest/index-debug.html

@@ -18,9 +18,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -35,7 +35,7 @@
             // Uncomment (along with both above) to print backtraces on type check errors:
             //objj_typecheck_prints_backtrace = true;
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -61,12 +61,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPBrowserTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPBrowserTest/index.html

@@ -17,7 +17,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script src="Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type="text/css">
@@ -45,12 +45,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPBrowserTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPButtonKeyEquivalentDefaultTest/index-debug.html

@@ -51,7 +51,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPButtonKeyEquivalentDefaultTest/index.html

@@ -50,7 +50,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPButtonTest/index-debug.html

@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPButtonTest/index.html

@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPColor-CPImage-description/index-debug.html

@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPColor-CPImage-description/index.html

@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPColorWellBindings/index-debug.html

@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPColorWellBindings/index.html

@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPComboBoxTest/index-debug.html

@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPComboBoxTest/index.html

@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPControlPerformClickExceptionTest/index-debug.html

@@ -51,7 +51,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPControlPerformClickExceptionTest/index.html

@@ -50,7 +50,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPCursor/index-debug.html

@@ -19,24 +19,24 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src = "Frameworks/Debug/Objective-J/Objective-J.js" type = "text/javascript"></script>
-        
+
         <script type = "text/javascript">
             objj_msgSend_reset();
-            
+
             // DEBUG OPTIONS:
-            
+
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to enable runtime type checking:
             //objj_msgSend_decorate(objj_typecheck_decorator);
-            
+
             // Uncomment (along with both above) to print backtraces on type check errors:
             //objj_typecheck_prints_backtrace = true;
         </script>
-        
+
         <style type = "text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -61,12 +61,12 @@
                                "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                "Loading CursorTest...</p></div>");
             </script>
-    
+
             <noscript>
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPCursor/index.html

@@ -18,7 +18,7 @@
         <script type = "text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script src = "Frameworks/Objective-J/Objective-J.js" type = "text/javascript"></script>
 
         <style type = "text/css">
@@ -46,12 +46,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CursorTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPDocumentControllerTest/withNib/index-debug.html

@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPDocumentControllerTest/withNib/index.html

@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPDocumentControllerTest/withoutNib/index-debug.html

@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPDocumentControllerTest/withoutNib/index.html

@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPFormatterTest/index-debug.html

@@ -21,9 +21,9 @@
         <link rel="apple-touch-startup-image" href="Resources/default.png" />
 
         <title>CPFormatterTest</title>
-        
+
         <script src="Resources/date-functions.js" type="text/javascript" charset="utf-8"></script>
-        
+
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks"];
@@ -86,7 +86,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPFormatterTest/index.html

@@ -21,7 +21,7 @@
         <link rel="apple-touch-startup-image" href="Resources/default.png" />
 
         <title>CPFormatterTest</title>
-        
+
         <script src="Resources/date-functions.js" type="text/javascript" charset="utf-8"></script>
 
         <script type="text/javascript">
@@ -60,7 +60,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPGraphicsTest/index-debug.html

@@ -51,7 +51,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPGraphicsTest/index.html

@@ -50,7 +50,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPImageViewAlignmentScaling/index-debug.html

@@ -88,7 +88,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPImageViewAlignmentScaling/index.html

@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPImageViewTest/index-debug.html

@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPImageViewTest/index.html

@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPImageViewbindingsTest/index-debug.html

@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPImageViewbindingsTest/index.html

@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPLevelIndicator/index-debug.html

@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPLevelIndicator/index.html

@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPLogTest/index-debug.html

@@ -51,7 +51,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPLogTest/index.html

@@ -50,7 +50,7 @@
                 <div id="container">
                     <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                         <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                        <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                         <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                         <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                             <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPMenuKeyEquivalents/index-debug.html

@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPMenuKeyEquivalents/index.html

@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPMenuRemoveAllTest/index-debug.html

@@ -84,7 +84,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPMenuRemoveAllTest/index.html

@@ -58,7 +58,7 @@
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPMenuTest/index-debug.html

@@ -26,9 +26,9 @@
             OBJJ_MAIN_FILE = "main.j";
             OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
         </script>
-        
+
         <script src="Frameworks/Debug/Objective-J/Objective-J.js" type="text/javascript" charset="UTF-8"></script>
-        
+
         <script type="text/javascript">
             objj_msgSend_reset();
 
@@ -36,7 +36,7 @@
 
             // Uncomment to enable printing of backtraces on exceptions:
             //objj_msgSend_decorate(objj_backtrace_decorator);
-            
+
             // Uncomment to supress exceptions that take place inside a message
             //objj_msgSend_decorate(objj_supress_exceptions_decorator)
 
@@ -53,7 +53,7 @@
             //CPLogRegister(CPLogConsole);
             //CPLogRegister(CPLogPopup);
         </script>
-        
+
         <style type="text/css">
             body{margin:0; padding:0;}
             #container {position: absolute; top:50%; left:50%;}
@@ -79,12 +79,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPMenuTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>

Tests/Manual/CPMenuTest/index.html

@@ -25,7 +25,7 @@
         <script type="text/javascript">
             OBJJ_MAIN_FILE = "main.j";
         </script>
-        
+
         <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
 
         <style type="text/css">
@@ -53,12 +53,12 @@
                                    "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
                                    "Loading CPMenuTest...</p></div>");
                 </script>
-        
+
                 <noscript>
                     <div id="container">
                         <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
                             <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
-                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
                             <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
                             <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
                                 <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>