[Bibdesk-commit] SF.net SVN: bibdesk:[29492] trunk/bibdesk

[hofman--- via Bibdesk-commit]

Revision: 29492
          http://sourceforge.net/p/bibdesk/svn/29492
Author:   hofman
Date:     2025-08-29 08:37:28 +0000 (Fri, 29 Aug 2025)
Log Message:
-----------
use start of absolute string as javascript alert title when we cannot get the 
host or scheme, e.g. for non-URL URIs. Do not use title of web page.

Modified Paths:
--------------
    trunk/bibdesk/BDSKTextImportController.m
    trunk/bibdesk/BDSKWebView.m

Modified: trunk/bibdesk/BDSKTextImportController.m
===================================================================
--- trunk/bibdesk/BDSKTextImportController.m    2025-08-28 16:50:42 UTC (rev 
29491)
+++ trunk/bibdesk/BDSKTextImportController.m    2025-08-29 08:37:28 UTC (rev 
29492)
@@ -967,16 +967,17 @@
 #pragma mark BDSKUIDelegate protocol
 
 - (NSString *)alertTitleForFrame:(WKFrameInfo *)frame {
-    NSString *title = nil;
-    if ([frame isMainFrame])
-        title = [webView title];
-    if ([NSString isEmptyString:title] == NO)
-        return title;
     NSURL *url = [[frame request] URL];
     NSString *scheme = [url scheme];
     NSString *host = [url host];
     if (scheme != nil && host != nil)
         return [NSString stringWithFormat:@"%@://%@", scheme, host];
+    NSString *string = [url absoluteString];
+    NSUInteger l = [string rangeOfString:@"/"].location;
+    if (l != NSNotFound)
+        string = [string substringToIndex:l];
+    if ([NSString isEmptyString:string] == NO)
+        return string;
     return NSLocalizedString(@"JavaScript", @"Default JavaScript alert title");
 }
 

Modified: trunk/bibdesk/BDSKWebView.m
===================================================================
--- trunk/bibdesk/BDSKWebView.m 2025-08-28 16:50:42 UTC (rev 29491)
+++ trunk/bibdesk/BDSKWebView.m 2025-08-29 08:37:28 UTC (rev 29492)
@@ -652,11 +652,17 @@
 }
 
 - (NSString *)alertTitleForFrame:(WebFrame *)frame {
-    NSURL *url = [[[frame dataSource] request] URL];
+    NSURL *url = [[frame request] URL];
     NSString *scheme = [url scheme];
     NSString *host = [url host];
     if (scheme != nil && host != nil)
         return [NSString stringWithFormat:@"%@://%@", scheme, host];
+    NSString *string = [url absoluteString];
+    NSUInteger l = [string rangeOfString:@"/"].location;
+    if (l != NSNotFound)
+        string = [string substringToIndex:l];
+    if ([NSString isEmptyString:string] == NO)
+        return string;
     return NSLocalizedString(@"JavaScript", @"Default JavaScript alert title");
 }
 

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit