Fixed an issue where local documents could not be opened by Cappuccin…

…o's document-apps. Reviewed by me.
280north · Jan 17, 2009 · e926aad · e926aad
1 parent 6d27e5d
commit e926aad
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/AppKit/CPDocument.j b/AppKit/CPDocument.j
@@ -389,7 +389,7 @@ var CPDocumentUntitledCount = 0;
     var statusCode = [aResponse statusCode];
 
     // Nothing to do if everything is hunky dory.
-    if (statusCode == 200)
+    if (statusCode === 200 || (statusCode === 0 && [aConnection isLocalFileConnection]))
         return;
 
     var session = aConnection.session;

diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j
@@ -633,11 +633,14 @@ var _CPTextFieldSquareBezelColor = nil,
 #if PLATFORM(DOM)
     var displayString = "";
 
-    if (aValue && [aValue respondsToSelector:@selector(string)])
-        displayString = [aValue string];
-    else if (aValue)
-        displayString += aValue;
-
+    if (aValue !== nil && aValue !== undefined)
+    {
+        if ([aValue respondsToSelector:@selector(string)])
+            displayString = [aValue string];
+        else
+            displayString += aValue;
+    }
+
     if ([[self window] firstResponder] == self)
         [[self class] _inputElement].value = displayString;
 

diff --git a/AppKit/CoreGraphics/CGContext.j b/AppKit/CoreGraphics/CGContext.j
@@ -338,7 +338,7 @@ function CGContextFillRect(aContext, aRect)
 
 function CGContextFillRects(aContext, rects, count)
 {
-    if (arguments["count"] == NULL)
+    if (arguments[2] === undefined)
         var count = rects.length;
 
     CGContextBeginPath(aContext);

diff --git a/Foundation/CPURLConnection.j b/Foundation/CPURLConnection.j
@@ -80,6 +80,7 @@ var CPURLConnectionDelegate = nil;
     CPURLRequest    _request;
     id              _delegate;
     BOOL            _isCanceled;
+    BOOL            _isLocalFileConnection;
 
     XMLHTTPRequest  _XMLHTTPRequest;
 }
@@ -150,6 +151,12 @@ var CPURLConnectionDelegate = nil;
         _delegate = aDelegate;
         _isCanceled = NO;
 
+        var path = [_request URL];
+
+        _isLocalFileConnection =    path.indexOf("file:") === 0 || 
+                                    ((path.indexOf("http:") !== 0 || path.indexOf("https:") !== 0) && 
+                                    window.location && window.location.protocol === "file:");
+
         _XMLHTTPRequest = objj_request_xmlhttp();
 
         if (shouldStartImmediately)
@@ -217,6 +224,11 @@ var CPURLConnectionDelegate = nil;
     }
 }
 
+- (BOOL)isLocalFileConnection
+{
+    return _isLocalFileConnection;
+}
+
 /* @ignore */
 - (void)_readyStateDidChange
 {
@@ -230,7 +242,7 @@ var CPURLConnectionDelegate = nil;
 
         if (!_isCanceled)
         {
-            if (statusCode == 200 || (url.indexOf("file:") === 0 && statusCode === 0) || ((url.indexOf("http:") !== 0 || url.indexOf("https:") !== 0) && window.location && window.location.protocol === "file:" && statusCode === 0))
+            if (statusCode == 200 || (statusCode === 0 && _isLocalFileConnection))
             {
                 [_delegate connection:self didReceiveData:_XMLHTTPRequest.responseText];
                 [_delegate connectionDidFinishLoading:self];