github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Avoid NSString’s deprecated percent encoding methods

Browse Source
This commit is contained in:
Allan Odgaard
2019-06-29 23:52:16 +02:00
parent b71efb0065
commit 11d67f3a22
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Frameworks/HTMLOutput/src/browser/HOWebViewDelegateHelper.mm
View File

@@ -49,7 +49,7 @@ static BOOL IsProtocolRelativeURL (NSURL* url)
- (void)webView:(WebView*)sender mouseDidMoveOverElement:(NSDictionary*)elementInformation modifierFlags:(NSUInteger)modifierFlags
{
NSURL* url = [elementInformation objectForKey:@"WebElementLinkURL"];
[self webView:sender setStatusText:[[url absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
[self webView:sender setStatusText:[[url absoluteString] stringByRemovingPercentEncoding]];
}
- (void)webView:(WebView*)sender runJavaScriptAlertPanelWithMessage:(NSString*)message initiatedByFrame:(WebFrame*)frame
@@ -128,7 +128,7 @@ static BOOL IsProtocolRelativeURL (NSURL* url)
if([[[request URL] scheme] isEqualToString:@"tm-file"])
{
NSString* fragment = [[request URL] fragment];
request = [NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"file://localhost%@%s%@", [[[request URL] path] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding], fragment ? "#" : "", fragment ?: @""]]];
request = [NSURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"file://localhost%@%s%@", [[[request URL] path] stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLPathAllowedCharacterSet], fragment ? "#" : "", fragment ?: @""]]];
}
if(IsProtocolRelativeURL([request URL]))
@@ -140,7 +140,7 @@ static BOOL IsProtocolRelativeURL (NSURL* url)
if([[request URL] isFileURL])
{
NSURL* redirectURL = [NSURL URLWithString:[NSString stringWithFormat:@"file://localhost%@?path=%@&error=1", [[[NSBundle bundleForClass:[self class]] pathForResource:@"error_not_found" ofType:@"html"] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding], [[[request URL] path] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]];
NSURL* redirectURL = [NSURL URLWithString:[NSString stringWithFormat:@"file://localhost%@?path=%@&error=1", [[[NSBundle bundleForClass:[self class]] pathForResource:@"error_not_found" ofType:@"html"] stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLPathAllowedCharacterSet], [[[request URL] path] stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet]]];
char const* path = [[request URL] fileSystemRepresentation];
struct stat buf;