Revision: 29443
http://sourceforge.net/p/bibdesk/svn/29443
Author: hofman
Date: 2025-08-23 21:26:48 +0000 (Sat, 23 Aug 2025)
Log Message:
-----------
make script message handler wrapper simply forward method
Modified Paths:
--------------
trunk/bibdesk/BDSKTextImportController.m
Modified: trunk/bibdesk/BDSKTextImportController.m
===================================================================
--- trunk/bibdesk/BDSKTextImportController.m 2025-08-23 16:19:22 UTC (rev
29442)
+++ trunk/bibdesk/BDSKTextImportController.m 2025-08-23 21:26:48 UTC (rev
29443)
@@ -108,19 +108,15 @@
#pragma mark -
-@protocol BDSKScriptMessageHandlerDelegate <NSObject>
-- (void)scriptMessageHandlerWithName:(NSString *)name
didReceiveMessage:(NSString *)body;
-@end
-
@interface BDSKScriptMessageHandler : NSObject <WKScriptMessageHandler> {
- __weak id<BDSKScriptMessageHandlerDelegate> delegate;
+ __weak id<WKScriptMessageHandler> scriptMessageHandler;
}
-@property (nonatomic, nullable, weak) id<BDSKScriptMessageHandlerDelegate>
delegate;
+@property (nonatomic, nullable, weak) id<WKScriptMessageHandler>
scriptMessageHandler;
@end
#pragma mark -
-@interface BDSKTextImportController () <WKNavigationDelegate, BDSKUIDelegate,
BDSKScriptMessageHandlerDelegate>
+@interface BDSKTextImportController () <WKNavigationDelegate, BDSKUIDelegate,
WKScriptMessageHandler>
- (void)handleFlagsChangedNotification:(NSNotification *)notification;
- (void)handleBibItemChangedNotification:(NSNotification *)notification;
@@ -650,7 +646,7 @@
WKWebViewConfiguration *config = [[WKWebViewConfiguration alloc] init];
WKUserContentController *userController = [config userContentController];
BDSKScriptMessageHandler *messageHandler = [[BDSKScriptMessageHandler
alloc] init];
- [messageHandler setDelegate:self];
+ [messageHandler setScriptMessageHandler:self];
[userController addScriptMessageHandler:messageHandler
name:@"changeSelection"];
[userController addScriptMessageHandler:messageHandler name:@"hoverLink"];
NSString *jsSource = @""
@@ -1150,9 +1146,11 @@
[menu insertItem:[NSMenuItem separatorItem] atIndex:j];
}
-#pragma mark BDSKScriptMessageHandlerDelegate protocol
+#pragma mark WKScriptMessageHandler protocol
-- (void)scriptMessageHandlerWithName:(NSString *)name
didReceiveMessage:(NSString *)body {
+- (void)userContentController:(WKUserContentController *)userContentController
didReceiveScriptMessage:(WKScriptMessage *)message {
+ NSString *name = [message name];
+ NSString *body = [message body];
if ([name isEqualToString:@"hoverLink"]) {
[statusLine setStringValue:body ?: @""];
} else if ([name isEqualToString:@"changeSelection"]) {
@@ -1797,13 +1795,10 @@
@implementation BDSKScriptMessageHandler
-@synthesize delegate;
+@synthesize scriptMessageHandler;
- (void)userContentController:(WKUserContentController *)userContentController
didReceiveScriptMessage:(WKScriptMessage *)message {
- NSString *body = [message body];
- if ([body isKindOfClass:[NSString class]] == NO)
- body = nil;
- [delegate scriptMessageHandlerWithName:[message name]
didReceiveMessage:body];
+ [scriptMessageHandler userContentController:userContentController
didReceiveScriptMessage:message];
}
@end
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
