Revision: 29584
http://sourceforge.net/p/bibdesk/svn/29584
Author: hofman
Date: 2025-09-15 16:02:15 +0000 (Mon, 15 Sep 2025)
Log Message:
-----------
combine methods when starting and finishing mainframe load
Modified Paths:
--------------
trunk/bibdesk/BDSKWebView.m
Modified: trunk/bibdesk/BDSKWebView.m
===================================================================
--- trunk/bibdesk/BDSKWebView.m 2025-09-15 15:46:19 UTC (rev 29583)
+++ trunk/bibdesk/BDSKWebView.m 2025-09-15 16:02:15 UTC (rev 29584)
@@ -366,15 +366,20 @@
[self reload:nil];
}
-- (void)startObservingDownloads {
+#pragma mark Start/Finish Load
+
+- (void)didStartLoadForMainFrame {
+ [self stopMonitoringURL];
+ [self resetFavicon];
+ [[NSNotificationCenter defaultCenter] removeObserver:self
name:BDSKDownloadsDidChangeNotification object:[BDSKDownloadManager
sharedManager]];
+}
+
+- (void)didFinishLoadForMainFrame {
+ [self retrieveFavicon];
if ([[self mainFrameURL] isCaseInsensitiveEqual:@"bibdesk:downloads"])
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(handleDownloadsDidChange:)
name:BDSKDownloadsDidChangeNotification object:[BDSKDownloadManager
sharedManager]];
}
-- (void)stopObservingDownloads {
- [[NSNotificationCenter defaultCenter] removeObserver:self
name:BDSKDownloadsDidChangeNotification object:[BDSKDownloadManager
sharedManager]];
-}
-
@end
#pragma mark -
@@ -434,12 +439,8 @@
- (void)webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame
*)frame{
if (frame == [sender mainFrame]) {
- if ([sender respondsToSelector:@selector(stopMonitoringURL)])
- [(BDSKWebView *)sender stopMonitoringURL];
- if ([sender respondsToSelector:@selector(stopObservingDownloads)])
- [(BDSKWebView *)sender stopObservingDownloads];
- if ([sender respondsToSelector:@selector(resetFavicon)])
- [(BDSKWebView *)sender resetFavicon];
+ if ([sender respondsToSelector:@selector(didStartLoadForMainFrame)])
+ [(BDSKWebView *)sender didStartLoadForMainFrame];
else
[self webView:sender setIcon:nil];
[self webView:sender setTitle:[NSLocalizedString(@"Loading",
@"Placeholder web group label") stringByAppendingEllipsis]];
@@ -474,13 +475,11 @@
}
}
}
- if ([sender respondsToSelector:@selector(retrieveFavicon)])
- [(BDSKWebView *)sender retrieveFavicon];
+ [self webView:sender setTitle:title];
+ if ([sender respondsToSelector:@selector(didFinishLoadForMainFrame)])
+ [(BDSKWebView *)sender didFinishLoadForMainFrame];
else
[self webView:sender setIcon:[sender mainFrameIcon]];
- [self webView:sender setTitle:title];
- if ([sender respondsToSelector:@selector(startObservingDownloads)])
- [(BDSKWebView *)sender startObservingDownloads];
}
[self webView:sender setLoading:[sender isLoading]];
if ([delegate
respondsToSelector:@selector(webView:didFinishLoadForFrame:)])
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
