diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index 60ded9f7a..62b4f0849 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -5139,7 +5139,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
{
[super viewWillMoveToWindow:aWindow];
- [self _stopObservingFirstResponderForWindow:aWindow];
+ [self _stopObservingFirstResponderForWindow:[self window]];
if (aWindow)
[self _startObservingFirstResponderForWindow:aWindow];
diff --git a/AppKit/Platform/CPPlatformWindow.j b/AppKit/Platform/CPPlatformWindow.j
index 16b1a4954..bf39de81a 100644
--- a/AppKit/Platform/CPPlatformWindow.j
+++ b/AppKit/Platform/CPPlatformWindow.j
@@ -224,18 +224,10 @@ var PrimaryPlatformWindow = NULL;
- (void)deminiaturize:(id)sender
{
-#if PLATFORM(DOM)
- if (_DOMWindow && typeof _DOMWindow["cpDeminiaturize"] === "function")
- _DOMWindow.cpDeminiaturize();
-#endif
}
- (void)miniaturize:(id)sender
{
-#if PLATFORM(DOM)
- if (_DOMWindow && typeof _DOMWindow["cpMiniaturize"] === "function")
- _DOMWindow.cpMiniaturize();
-#endif
}
- (void)moveWindow:(CPWindow)aWindow fromLevel:(int)fromLevel toLevel:(int)toLevel
@@ -255,31 +247,16 @@ var PrimaryPlatformWindow = NULL;
- (void)setLevel:(CPInteger)aLevel
{
_level = aLevel;
-
-#if PLATFORM(DOM)
- if (_DOMWindow && _DOMWindow.cpSetLevel)
- _DOMWindow.cpSetLevel(aLevel);
-#endif
}
- (void)setHasShadow:(BOOL)shouldHaveShadow
{
_hasShadow = shouldHaveShadow;
-
-#if PLATFORM(DOM)
- if (_DOMWindow && _DOMWindow.cpSetHasShadow)
- _DOMWindow.cpSetHasShadow(shouldHaveShadow);
-#endif
}
- (void)setShadowStyle:(int)aStyle
{
_shadowStyle = aStyle;
-
-#if PLATFORM(DOM)
- if (_DOMWindow && _DOMWindow.cpSetShadowStyle)
- _shadowStyle.cpSetShadowStyle(aStyle);
-#endif
}
- (BOOL)supportsFullPlatformWindows
diff --git a/AppKit/Platform/DOM/CPPlatformWindow+DOM.j b/AppKit/Platform/DOM/CPPlatformWindow+DOM.j
index d3784af63..273c98897 100644
--- a/AppKit/Platform/DOM/CPPlatformWindow+DOM.j
+++ b/AppKit/Platform/DOM/CPPlatformWindow+DOM.j
@@ -247,9 +247,6 @@ _CPPlatformWindowWillCloseNotification = @"_CPPlatformWindowWillCloseNotificatio
if (!_DOMWindow)
return [self contentRect];
- if (_DOMWindow.cpFrame)
- return _DOMWindow.cpFrame();
-
var contentRect = CGRectMakeZero();
if (window.screenTop)
@@ -278,9 +275,6 @@ _CPPlatformWindowWillCloseNotification = @"_CPPlatformWindowWillCloseNotificatio
if (!_DOMWindow)
return;
- if (typeof _DOMWindow["cpSetFrame"] === "function")
- return _DOMWindow.cpSetFrame([self contentRect]);
-
var origin = [self contentRect].origin,
nativeOrigin = [self nativeContentRect].origin;
@@ -576,22 +570,12 @@ _CPPlatformWindowWillCloseNotification = @"_CPPlatformWindowWillCloseNotificatio
[PlatformWindows addObject:self];
- // FIXME: cpSetFrame?
_DOMWindow.document.write('');
_DOMWindow.document.close();
if (self != [CPPlatformWindow primaryPlatformWindow])
_DOMWindow.document.title = _title;
- if (![CPPlatform isBrowser])
- {
- _DOMWindow.cpWindowNumber = [self._only windowNumber];
- _DOMWindow.cpSetFrame(_contentRect);
- _DOMWindow.cpSetLevel(_level);
- _DOMWindow.cpSetHasShadow(_hasShadow);
- _DOMWindow.cpSetShadowStyle(_shadowStyle);
- }
-
[self registerDOMWindow];
_DOMBodyElement.style.cursor = [[CPCursor currentCursor] _cssString];
diff --git a/Foundation/CPDateFormatter.j b/Foundation/CPDateFormatter.j
index 2d24155b3..65c048500 100644
--- a/Foundation/CPDateFormatter.j
+++ b/Foundation/CPDateFormatter.j
@@ -743,7 +743,7 @@ var defaultDateFormatterBehavior = CPDateFormatterBehavior10_4,
continue;
}
- if ([character isEqualToString:@","] || [character isEqualToString:@":"] || [character isEqualToString:@"/"] || [character isEqualToString:@"-"] || [character isEqualToString:@" "])
+ if ([character isEqualToString:@","] || [character isEqualToString:@":"] || [character isEqualToString:@"/"] || [character isEqualToString:@"-"] || [character isEqualToString:@" "] || [character isEqualToString:@"."])
{
result += [self _stringFromToken:currentToken date:aDate];
result += character;
diff --git a/Tools/XcodeCapp/XcodeCapp/Info.plist b/Tools/XcodeCapp/XcodeCapp/Info.plist
index 415a70450..49d970dab 100644
--- a/Tools/XcodeCapp/XcodeCapp/Info.plist
+++ b/Tools/XcodeCapp/XcodeCapp/Info.plist
@@ -2,6 +2,8 @@
+ NSUserNotificationAlertStyle
+ alert
CFBundleDevelopmentRegion
en
CFBundleDocumentTypes
@@ -49,26 +51,6 @@
MainMenu
NSPrincipalClass
NSApplication
- NSUserNotificationAlertStyle
- alert
- UTExportedTypeDeclarations
-
-
- UTTypeConformsTo
-
- public.objective-c-source
-
- UTTypeIdentifier
- org.cappuccino.objj-source
- UTTypeTagSpecification
-
- public.filename-extension
-
- j
-
-
-
-
XCCCompatibilityVersion
4
XCCLastCappuccinoMasterBranchURL