Revision: 29617
http://sourceforge.net/p/bibdesk/svn/29617
Author: hofman
Date: 2025-09-21 08:42:33 +0000 (Sun, 21 Sep 2025)
Log Message:
-----------
Use webView instead of sender as parameter mname of delegate methods
Modified Paths:
--------------
trunk/bibdesk/BDSKWebView.h
trunk/bibdesk/BDSKWebView.m
Modified: trunk/bibdesk/BDSKWebView.h
===================================================================
--- trunk/bibdesk/BDSKWebView.h 2025-09-20 17:25:46 UTC (rev 29616)
+++ trunk/bibdesk/BDSKWebView.h 2025-09-21 08:42:33 UTC (rev 29617)
@@ -80,23 +80,23 @@
@protocol BDSKWebViewDelegate <NSObject>
@optional
-- (void)webView:(WebView *)sender didStartLoadForFrame:(WebFrame *)frame;
-- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame;
-- (void)webView:(WebView *)sender didFailLoadForFrame:(WebFrame *)frame;
+- (void)webView:(WebView *)webView didStartLoadForFrame:(WebFrame *)frame;
+- (void)webView:(WebView *)webView didFinishLoadForFrame:(WebFrame *)frame;
+- (void)webView:(WebView *)webView didFailLoadForFrame:(WebFrame *)frame;
-- (void)webView:(WebView *)sender setTitle:(NSString *)title;
-- (void)webView:(WebView *)sender setStatusText:(nullable NSString *)text;
+- (void)webView:(WebView *)webView setTitle:(NSString *)title;
+- (void)webView:(WebView *)webView setStatusText:(nullable NSString *)text;
-- (WebView *)webViewCreateWebView:(WebView *)sender;
-- (void)webViewShow:(WebView *)sender;
-- (void)webViewClose:(WebView *)sender;
-- (void)webViewRunModal:(WebView *)sender;
+- (WebView *)webViewCreateWebView:(WebView *)webView;
+- (void)webViewShow:(WebView *)webView;
+- (void)webViewClose:(WebView *)webView;
+- (void)webViewRunModal:(WebView *)webView;
-- (void)webView:(WebView *)sender setResizable:(BOOL)resizable;
-- (void)webView:(WebView *)sender setFrame:(NSRect)frame;
-- (void)webView:(WebView *)sender setStatusBarVisible:(BOOL)visible;
+- (void)webView:(WebView *)webView setResizable:(BOOL)resizable;
+- (void)webView:(WebView *)webView setFrame:(NSRect)frame;
+- (void)webView:(WebView *)webView setStatusBarVisible:(BOOL)visible;
-- (NSArray *)webView:(WebView *)sender
contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray
*)defaultMenuItems;
+- (NSArray *)webView:(WebView *)webView
contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray
*)defaultMenuItems;
@end
Modified: trunk/bibdesk/BDSKWebView.m
===================================================================
--- trunk/bibdesk/BDSKWebView.m 2025-09-20 17:25:46 UTC (rev 29616)
+++ trunk/bibdesk/BDSKWebView.m 2025-09-21 08:42:33 UTC (rev 29617)
@@ -439,72 +439,72 @@
#pragma mark Delegate forward
-- (void)webView:(WebView *)sender setTitle:(NSString *)title {
+- (void)webView:(WebView *)webView setTitle:(NSString *)title {
if ([delegate respondsToSelector:@selector(webView:setTitle:)])
- [delegate webView:sender setTitle:title ?: @""];
+ [delegate webView:webView setTitle:title ?: @""];
}
#pragma mark WebFrameLoadDelegate protocol
-- (void)webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame
*)frame{
- if (frame == [sender mainFrame]) {
- if ([sender respondsToSelector:@selector(didStartLoadForMainFrame)])
- [(BDSKWebView *)sender didStartLoadForMainFrame];
+- (void)webView:(WebView *)webView didStartProvisionalLoadForFrame:(WebFrame
*)frame{
+ if (frame == [webView mainFrame]) {
+ if ([webView respondsToSelector:@selector(didStartLoadForMainFrame)])
+ [(BDSKWebView *)webView didStartLoadForMainFrame];
else
- [self webView:sender setTitle:[NSLocalizedString(@"Loading",
@"Placeholder web group label") stringByAppendingEllipsis]];
- if ([sender respondsToSelector: @selector(URL)]) {
- [sender willChangeValueForKey:@"URL"];
- [sender didChangeValueForKey:@"URL"];
+ [self webView:webView setTitle:[NSLocalizedString(@"Loading",
@"Placeholder web group label") stringByAppendingEllipsis]];
+ if ([webView respondsToSelector:@selector(URL)]) {
+ [webView willChangeValueForKey:@"URL"];
+ [webView didChangeValueForKey:@"URL"];
}
}
- [sender willChangeValueForKey:@"loading"];
- [sender didChangeValueForKey:@"loading"];
+ [webView willChangeValueForKey:@"loading"];
+ [webView didChangeValueForKey:@"loading"];
if ([delegate respondsToSelector:@selector(webView:didStartLoadForFrame:)])
- [delegate webView:sender didStartLoadForFrame:frame];
+ [delegate webView:webView didStartLoadForFrame:frame];
}
-- (void)webView:(WebView *)sender
didReceiveServerRedirectForProvisionalLoadForFrame:(WebFrame *)frame {
- if (frame == [sender mainFrame] && [sender respondsToSelector:
@selector(URL)]) {
- [sender willChangeValueForKey:@"URL"];
- [sender didChangeValueForKey:@"URL"];
+- (void)webView:(WebView *)webView
didReceiveServerRedirectForProvisionalLoadForFrame:(WebFrame *)frame {
+ if (frame == [webView mainFrame] && [webView
respondsToSelector:@selector(URL)]) {
+ [webView willChangeValueForKey:@"URL"];
+ [webView didChangeValueForKey:@"URL"];
}
}
-- (void)webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame {
- if (frame == [sender mainFrame] && [sender respondsToSelector:
@selector(URL)]) {
- [sender willChangeValueForKey:@"URL"];
- [sender didChangeValueForKey:@"URL"];
+- (void)webView:(WebView *)webView didCommitLoadForFrame:(WebFrame *)frame {
+ if (frame == [webView mainFrame] && [webView
respondsToSelector:@selector(URL)]) {
+ [webView willChangeValueForKey:@"URL"];
+ [webView didChangeValueForKey:@"URL"];
}
}
-- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame{
+- (void)webView:(WebView *)webView didFinishLoadForFrame:(WebFrame *)frame{
- if (frame == [sender mainFrame]) {
- if ([sender respondsToSelector:@selector(didFinishLoadForMainFrame)])
- [(BDSKWebView *)sender didFinishLoadForMainFrame];
+ if (frame == [webView mainFrame]) {
+ if ([webView respondsToSelector:@selector(didFinishLoadForMainFrame)])
+ [(BDSKWebView *)webView didFinishLoadForMainFrame];
else
- [self webView:sender setTitle:[sender mainFrameTitle]];
+ [self webView:webView setTitle:[webView mainFrameTitle]];
}
- [sender willChangeValueForKey:@"loading"];
- [sender didChangeValueForKey:@"loading"];
+ [webView willChangeValueForKey:@"loading"];
+ [webView didChangeValueForKey:@"loading"];
if ([delegate
respondsToSelector:@selector(webView:didFinishLoadForFrame:)])
- [delegate webView:sender didFinishLoadForFrame:frame];
+ [delegate webView:webView didFinishLoadForFrame:frame];
}
-- (void)webView:(WebView *)sender didFailLoadWithError:(NSError *)error
forFrame:(WebFrame *)frame {
- if (frame == [sender mainFrame]) {
- if ([sender
respondsToSelector:@selector(didFailLoadForMainFrameWithError:)])
- [(BDSKWebView *)sender didFailLoadForMainFrameWithError:error];
+- (void)webView:(WebView *)webView didFailLoadWithError:(NSError *)error
forFrame:(WebFrame *)frame {
+ if (frame == [webView mainFrame]) {
+ if ([webView
respondsToSelector:@selector(didFailLoadForMainFrameWithError:)])
+ [(BDSKWebView *)webView didFailLoadForMainFrameWithError:error];
else
- [self webView:sender setTitle:NSLocalizedString(@"Error",
@"Placeholder web group label")];
+ [self webView:webView setTitle:NSLocalizedString(@"Error",
@"Placeholder web group label")];
}
- [sender willChangeValueForKey:@"loading"];
- [sender didChangeValueForKey:@"loading"];
+ [webView willChangeValueForKey:@"loading"];
+ [webView didChangeValueForKey:@"loading"];
if ([delegate respondsToSelector:@selector(webView:didFailLoadForFrame:)])
- [delegate webView:sender didFailLoadForFrame:frame];
+ [delegate webView:webView didFailLoadForFrame:frame];
if ([[error domain] isEqualToString:NSURLErrorDomain] == NO || [error
code] != NSURLErrorCancelled) {
// !!! logs are here to help diagnose problems that users are reporting
@@ -519,22 +519,22 @@
}
}
-- (void)webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError
*)error forFrame:(WebFrame *)frame{
- [self webView:sender didFailLoadWithError:error forFrame:frame];
+- (void)webView:(WebView *)webView didFailProvisionalLoadWithError:(NSError
*)error forFrame:(WebFrame *)frame{
+ [self webView:webView didFailLoadWithError:error forFrame:frame];
}
-- (void)webView:(WebView *)sender didReceiveTitle:(NSString *)title
forFrame:(WebFrame *)frame {
- if (frame == [sender mainFrame] || frame == nil)
- [self webView:sender setTitle:title];
+- (void)webView:(WebView *)webView didReceiveTitle:(NSString *)title
forFrame:(WebFrame *)frame {
+ if (frame == [webView mainFrame] || frame == nil)
+ [self webView:webView setTitle:title];
}
-- (void)webView:(WebView *)sender didClearWindowObject:(WebScriptObject
*)windowObject forFrame:(WebFrame *)frame {
+- (void)webView:(WebView *)webView didClearWindowObject:(WebScriptObject
*)windowObject forFrame:(WebFrame *)frame {
[windowObject setValue:[BDSKDownloadManager sharedManager]
forKey:@"downloads"];
}
#pragma mark WebPolicyDelegate protocol
-- (void)webView:(WebView *)sender
decidePolicyForNavigationAction:(NSDictionary *)actionInformation
request:(NSURLRequest *)request frame:(WebFrame *)frame
decisionListener:(id<WebPolicyDecisionListener>)listener {
+- (void)webView:(WebView *)webView
decidePolicyForNavigationAction:(NSDictionary *)actionInformation
request:(NSURLRequest *)request frame:(WebFrame *)frame
decisionListener:(id<WebPolicyDecisionListener>)listener {
if ([[request valueForHTTPHeaderField:@"Content-Disposition"]
hasPrefix:@"attachment"])
[listener download];
else
@@ -541,7 +541,7 @@
[listener use];
}
-- (void)webView:(WebView *)sender decidePolicyForMIMEType:(NSString *)type
request:(NSURLRequest *)request frame:(WebFrame *)frame
decisionListener:(id<WebPolicyDecisionListener>)listener {
+- (void)webView:(WebView *)webView decidePolicyForMIMEType:(NSString *)type
request:(NSURLRequest *)request frame:(WebFrame *)frame
decisionListener:(id<WebPolicyDecisionListener>)listener {
if ([WebView canShowMIMEType:type] && [[request
valueForHTTPHeaderField:@"Content-Disposition"] hasPrefix:@"attachment"] == NO)
[listener use];
else
@@ -562,17 +562,17 @@
#pragma mark WebUIDelegate protocol
-- (void)webView:(WebView *)sender setStatusText:(NSString *)text {
- if ([sender window] && [delegate
respondsToSelector:@selector(webView:setStatusText:)])
- [delegate webView:sender setStatusText:text];
+- (void)webView:(WebView *)webView setStatusText:(NSString *)text {
+ if ([webView window] && [delegate
respondsToSelector:@selector(webView:setStatusText:)])
+ [delegate webView:webView setStatusText:text];
}
-- (void)webView:(WebView *)sender mouseDidMoveOverElement:(NSDictionary
*)elementInformation modifierFlags:(NSUInteger)modifierFlags {
+- (void)webView:(WebView *)webView mouseDidMoveOverElement:(NSDictionary
*)elementInformation modifierFlags:(NSUInteger)modifierFlags {
NSURL *aLink = [elementInformation objectForKey:WebElementLinkURLKey];
- [self webView:sender setStatusText:[[aLink absoluteString]
stringByRemovingPercentEncoding]];
+ [self webView:webView setStatusText:[[aLink absoluteString]
stringByRemovingPercentEncoding]];
}
-- (NSArray *)webView:(WebView *)sender
contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray
*)defaultMenuItems {
+- (NSArray *)webView:(WebView *)webView
contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray
*)defaultMenuItems {
NSMutableArray *menuItems = [NSMutableArray
arrayWithArray:defaultMenuItems];
NSMenuItem *item;
@@ -583,7 +583,7 @@
action:@selector(openLinkInBrowser:)
keyEquivalent:@""];
[item setTag:BDSKWebMenuItemTagOpenLinkInBrowser];
- [item setTarget:sender];
+ [item setTarget:webView];
[item setRepresentedObject:element];
[menuItems insertObject:item atIndex:++i];
@@ -591,7 +591,7 @@
action:@selector(bookmarkLink:)
keyEquivalent:@""];
[item setTag:BDSKWebMenuItemTagBookmarkLink];
- [item setTarget:sender];
+ [item setTarget:webView];
[item setRepresentedObject:element];
[menuItems insertObject:item atIndex:++i];
@@ -600,7 +600,7 @@
action:@selector(revealLink:)
keyEquivalent:@""];
[item setTag:BDSKWebMenuItemTagRevealLink];
- [item setTarget:sender];
+ [item setTarget:webView];
[item setRepresentedObject:element];
[menuItems insertObject:item atIndex:++i];
}
@@ -613,7 +613,7 @@
action:@selector(saveSource:)
keyEquivalent:@""];
[item setTag:BDSKWebMenuItemTagSavePage];
- [item setTarget:sender];
+ [item setTarget:webView];
[menuItems insertObject:item atIndex:++i];
item = [[NSMenuItem alloc] initWithTitle:[NSLocalizedString(@"Bookmark
This Page", @"Menu item title") stringByAppendingEllipsis]
@@ -620,7 +620,7 @@
action:@selector(addBookmark:)
keyEquivalent:@""];
[item setTag:BDSKWebMenuItemTagAddBookmark];
- [item setTarget:sender];
+ [item setTarget:webView];
[menuItems insertObject:item atIndex:++i];
}
@@ -641,7 +641,7 @@
action:@selector(makeTextLarger:)
keyEquivalent:@""];
[item setTag:BDSKWebMenuItemTagMakeTextLarger];
- [item setTarget:sender];
+ [item setTarget:webView];
[menuItems insertObject:item atIndex:++i];
item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Decrease Text
Size", @"Menu item title")
@@ -648,7 +648,7 @@
action:@selector(makeTextSmaller:)
keyEquivalent:@""];
[item setTag:BDSKWebMenuItemTagMakeTextSmaller];
- [item setTarget:sender];
+ [item setTarget:webView];
[menuItems insertObject:item atIndex:++i];
if ([[menuItems valueForKey:@"tag"] indexOfObject:[NSNumber
numberWithInteger:BDSKWebMenuItemTagAddBookmark]] == NSNotFound) {
@@ -658,21 +658,21 @@
action:@selector(addBookmark:)
keyEquivalent:@""];
[item setTag:BDSKWebMenuItemTagAddBookmark];
- [item setTarget:sender];
+ [item setTarget:webView];
[menuItems insertObject:item atIndex:++i];
}
if ([delegate
respondsToSelector:@selector(webView:contextMenuItemsForElement:defaultMenuItems:)])
- return [delegate webView:sender contextMenuItemsForElement:element
defaultMenuItems:menuItems];
+ return [delegate webView:webView contextMenuItemsForElement:element
defaultMenuItems:menuItems];
return menuItems;
}
-- (WebView *)webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest
*)request {
+- (WebView *)webView:(WebView *)webView createWebViewWithRequest:(NSURLRequest
*)request {
// due to a known WebKit bug the request is always nil
https://bugs.webkit.org/show_bug.cgi?id=23432
WebView *view = nil;
if ([delegate respondsToSelector:@selector(webViewCreateWebView:)])
- view = [delegate webViewCreateWebView:sender];
+ view = [delegate webViewCreateWebView:webView];
if (view == nil)
view = [(BDSKNewWebWindowHandler *)[BDSKNewWebWindowHandler
sharedHandler] webView];
if (request)
@@ -680,7 +680,7 @@
return view;
}
-- (WebView *)webView:(WebView *)sender
createWebViewModalDialogWithRequest:(NSURLRequest *)request {
+- (WebView *)webView:(WebView *)webView
createWebViewModalDialogWithRequest:(NSURLRequest *)request {
WebView *view = [[[BDSKWebViewModalDialogController alloc] init] webView];
if (request)
[[view mainFrame] loadRequest:request];
@@ -688,36 +688,36 @@
}
// this seems to be necessary in order for
webView:createWebViewModalDialogWithRequest: to work
-- (void)webViewRunModal:(WebView *)sender {
+- (void)webViewRunModal:(WebView *)webView {
if ([delegate respondsToSelector:@selector(webViewRunModal:)])
- [delegate webViewRunModal:sender];
+ [delegate webViewRunModal:webView];
}
-- (void)webViewShow:(WebView *)sender {
+- (void)webViewShow:(WebView *)webView {
if ([delegate respondsToSelector:@selector(webViewShow:)])
- [delegate webViewShow:sender];
+ [delegate webViewShow:webView];
}
-- (void)webViewClose:(WebView *)sender {
+- (void)webViewClose:(WebView *)webView {
if ([delegate respondsToSelector:@selector(webViewClose:)])
- [delegate webViewClose:sender];
+ [delegate webViewClose:webView];
}
// we don't want the default implementation to change our document window
resizability
-- (void)webView:(WebView *)sender setResizable:(BOOL)resizable {
+- (void)webView:(WebView *)webView setResizable:(BOOL)resizable {
if ([delegate respondsToSelector:@selector(webView:setResizable:)])
- [delegate webView:sender setResizable:resizable];
+ [delegate webView:webView setResizable:resizable];
}
// we don't want the default implementation to change our document window frame
-- (void)webView:(WebView *)sender setFrame:(NSRect)frame {
+- (void)webView:(WebView *)webView setFrame:(NSRect)frame {
if ([delegate respondsToSelector:@selector(webView:setFrame:)])
- [delegate webView:sender setFrame:frame];
+ [delegate webView:webView setFrame:frame];
}
-- (void)webView:(WebView *)sender setStatusBarVisible:(BOOL)visible {
+- (void)webView:(WebView *)webView setStatusBarVisible:(BOOL)visible {
if ([delegate respondsToSelector:@selector(webView:setStatusBarVisible:)])
- [delegate webView:sender setStatusBarVisible:visible];
+ [delegate webView:webView setStatusBarVisible:visible];
}
- (NSAlert *)javaScriptAlertPanelWithMessage:(NSString *)message
initiatedByFrame:(WebFrame *)frame withConfirm:(BOOL)confirm {
@@ -747,17 +747,17 @@
return alert;
}
-- (void)webView:(WebView *)sender runJavaScriptAlertPanelWithMessage:(NSString
*)message initiatedByFrame:(WebFrame *)frame {
+- (void)webView:(WebView *)webView
runJavaScriptAlertPanelWithMessage:(NSString *)message
initiatedByFrame:(WebFrame *)frame {
NSAlert *alert = [self javaScriptAlertPanelWithMessage:message
initiatedByFrame:frame withConfirm:NO];
[alert runModal];
}
-- (BOOL)webView:(WebView *)sender
runJavaScriptConfirmPanelWithMessage:(NSString *)message
initiatedByFrame:(WebFrame *)frame {
+- (BOOL)webView:(WebView *)webView
runJavaScriptConfirmPanelWithMessage:(NSString *)message
initiatedByFrame:(WebFrame *)frame {
NSAlert *alert = [self javaScriptAlertPanelWithMessage:message
initiatedByFrame:frame withConfirm:YES];
return NSAlertFirstButtonReturn == [alert runModal];
}
-- (NSString *)webView:(WebView *)sender
runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString
*)defaultText initiatedByFrame:(WebFrame *)frame {
+- (NSString *)webView:(WebView *)webView
runJavaScriptTextInputPanelWithPrompt:(NSString *)prompt defaultText:(NSString
*)defaultText initiatedByFrame:(WebFrame *)frame {
NSAlert *alert = [self javaScriptAlertPanelWithMessage:prompt
initiatedByFrame:frame withConfirm:YES];
NSTextField *textField = [[NSTextField alloc]
initWithFrame:NSMakeRect(0.0, 0.0, 300.0, 21.0)];
[textField sizeToFit];
@@ -768,7 +768,7 @@
return NSAlertFirstButtonReturn == [alert runModal] ? [textField
stringValue] : nil;
}
-- (void)webView:(WebView *)sender
runOpenPanelForFileButtonWithResultListener:(id < WebOpenPanelResultListener
>)resultListener {
+- (void)webView:(WebView *)webView
runOpenPanelForFileButtonWithResultListener:(id < WebOpenPanelResultListener
>)resultListener {
NSOpenPanel *openPanel = [NSOpenPanel openPanel];
if ([openPanel runModal] == NSModalResponseOK)
[resultListener chooseFilename:[[openPanel URL] path]];
@@ -777,7 +777,7 @@
}
// This is a private WebUIDelegate method that is called by WebPDFView
-- (void)webView:(WebView *)sender saveFrameView:(WebFrameView *)frameView
showingPanel:(BOOL)showingPanel {
+- (void)webView:(WebView *)webView saveFrameView:(WebFrameView *)frameView
showingPanel:(BOOL)showingPanel {
WebDataSource *dataSource = [[frameView webFrame] dataSource];
NSString *downloadsDir = [[[NSUserDefaults standardUserDefaults]
stringForKey:BDSKDownloadsDirectoryKey] stringByExpandingTildeInPath];
NSURL *downloadsURL = downloadsDir ? [NSURL fileURLWithPath:downloadsDir
isDirectory:YES] : [[NSFileManager defaultManager] downloadFolderURL];
@@ -801,7 +801,7 @@
// this is needed because WebView uses the document's undo manager by default,
rather than the one from the window.
// I consider this a bug
-- (NSUndoManager *)undoManagerForWebView:(WebView *)sender {
+- (NSUndoManager *)undoManagerForWebView:(WebView *)webView {
if (undoManager == nil)
undoManager = [[NSUndoManager alloc] init];
return undoManager;
@@ -832,7 +832,7 @@
return self;
}
-- (void)webView:(WebView *)sender
decidePolicyForNavigationAction:(NSDictionary *)actionInformation
request:(NSURLRequest *)request frame:(WebFrame *)frame
decisionListener:(id<WebPolicyDecisionListener>)listener {
+- (void)webView:(WebView *)webView
decidePolicyForNavigationAction:(NSDictionary *)actionInformation
request:(NSURLRequest *)request frame:(WebFrame *)frame
decisionListener:(id<WebPolicyDecisionListener>)listener {
[listener ignore];
[[NSWorkspace sharedWorkspace] openURLWithDefaultApp:[request URL]];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
