WebKit:

	Support for fix for:
	<rdar://problem/3734309> Safari doesn't open folders in title bar menu with non-Roman names using Cmd+click

        Reviewed by john.

        * Misc.subproj/WebNSURLExtras.h:
        * Misc.subproj/WebNSURLExtras.m:
        (+[NSURL _web_URLWithUserTypedString:relativeToURL:]): renamed to take relativeToURL parameter
        (+[NSURL _web_URLWithUserTypedString:]): call _web_URLWithUserTypedString:relativeToURL: with nil for URL

WebBrowser:

	Fixed: <rdar://problem/3734309> Safari doesn't open folders in title bar menu with non-Roman names using Cmd+click

        Reviewed by john.

        * TitleBarButton.m:
        (-[TitleBarButton showPathRepresentingPopUpMenu]): use _web_URLWithUserTypedString:: since the path returned by [NSURL path] is of the "user typed" variety

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8155 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 48dbe55fee9d0dbc2370be1aeeb47085d061994f..42cb01d431308366b4ff568b73974728b97c9db3 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2004-12-07  Administrator  <cblu@apple.com>
+
+       Support for fix for:
+       <rdar://problem/3734309> Safari doesn't open folders in title bar menu with non-Roman names using Cmd+click
+
+        Reviewed by john.
+
+        * Misc.subproj/WebNSURLExtras.h:
+        * Misc.subproj/WebNSURLExtras.m:
+        (+[NSURL _web_URLWithUserTypedString:relativeToURL:]): renamed to take relativeToURL parameter
+        (+[NSURL _web_URLWithUserTypedString:]): call _web_URLWithUserTypedString:relativeToURL: with nil for URL
+
 2004-12-07  Richard Williamson   <rjw@apple.com>
 
        Fixed <rdar://problem/3905564> REGRESSION (Tiger); in History menu, pixel size appears but is wrong for standalone images in Safari.

diff --git a/WebKit/Misc.subproj/WebNSURLExtras.h b/WebKit/Misc.subproj/WebNSURLExtras.h
index 3eadbb2fbce7004af1cc0274f55bfe45979f6543..83a5878ba20edee723c22eeaecaababd319d40c5 100644 (file)
--- a/WebKit/Misc.subproj/WebNSURLExtras.h
+++ b/WebKit/Misc.subproj/WebNSURLExtras.h
@@ -9,6 +9,7 @@
 @interface NSURL (WebNSURLExtras)
 
 + (NSURL *)_web_URLWithUserTypedString:(NSString *)string;
++ (NSURL *)_web_URLWithUserTypedString:(NSString *)string relativeToURL:(NSURL *)URL;
 
 + (NSURL *)_web_URLWithDataAsString:(NSString *)string;
 + (NSURL *)_web_URLWithDataAsString:(NSString *)string relativeToURL:(NSURL *)baseURL;

diff --git a/WebKit/Misc.subproj/WebNSURLExtras.m b/WebKit/Misc.subproj/WebNSURLExtras.m
index 8d31e485a7bdf5252588590945e3f27dc2600aee..b9aaad884f935eac81896d4552fe0dbc47f1bcfe 100644 (file)
--- a/WebKit/Misc.subproj/WebNSURLExtras.m
+++ b/WebKit/Misc.subproj/WebNSURLExtras.m
@@ -258,7 +258,7 @@ static NSString *mapHostNames(NSString *string, BOOL encode)
     return [mutableCopy autorelease];
 }
 
-+ (NSURL *)_web_URLWithUserTypedString:(NSString *)string
++ (NSURL *)_web_URLWithUserTypedString:(NSString *)string relativeToURL:(NSURL *)URL
 {
     if (string == nil) {
         return nil;
@@ -293,7 +293,12 @@ static NSString *mapHostNames(NSString *string, BOOL encode)
     }
  
     NSData *data = [NSData dataWithBytesNoCopy:outBytes length:outLength]; // adopts outBytes
-    return [self _web_URLWithData:data relativeToURL:nil];
+    return [self _web_URLWithData:data relativeToURL:URL];
+}
+
++ (NSURL *)_web_URLWithUserTypedString:(NSString *)string
+{
+    return [self _web_URLWithUserTypedString:string relativeToURL:nil];
 }
 
 + (NSURL *)_web_URLWithDataAsString:(NSString *)string