Revision: 18374
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=18374&view=rev
Author: hofman
Date: 2012-01-07 11:24:19 +0000 (Sat, 07 Jan 2012)
Log Message:
-----------
ignore "plug-in handled load" errors from webview, as this isn't a failure
Modified Paths:
--------------
trunk/bibdesk/BDSKWebView.m
Modified: trunk/bibdesk/BDSKWebView.m
===================================================================
--- trunk/bibdesk/BDSKWebView.m 2012-01-07 07:34:35 UTC (rev 18373)
+++ trunk/bibdesk/BDSKWebView.m 2012-01-07 11:24:19 UTC (rev 18374)
@@ -250,9 +250,12 @@
// !!! logs are here to help diagnose problems that users are reporting
NSLog(@"-[%@ %@] %@", [self class], NSStringFromSelector(_cmd), error);
- NSURL *url = [[[frame provisionalDataSource] request] URL];
- NSString *errorHTML = [NSString
stringWithFormat:@"<html><title>%@</title><body><h1>%@</h1></body></html>",
NSLocalizedString(@"Error", @"Placeholder web group label"), [error
localizedDescription]];
- [frame loadAlternateHTMLString:errorHTML baseURL:nil
forUnreachableURL:url];
+ // "plug-in handled load" is reported as a failure with code 204
+ if ([[error domain] isEqualToString:WebKitErrorDomain] == NO || [error
code] != 204) {
+ NSURL *url = [[[frame provisionalDataSource] request] URL];
+ NSString *errorHTML = [NSString
stringWithFormat:@"<html><title>%@</title><body><h1>%@</h1></body></html>",
NSLocalizedString(@"Error", @"Placeholder web group label"), [error
localizedDescription]];
+ [frame loadAlternateHTMLString:errorHTML baseURL:nil
forUnreachableURL:url];
+ }
}
- (void)webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError
*)error forFrame:(WebFrame *)frame{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
