Make an executive decision to not support regions.

[cydia.git] / CyteKit / WebView.mm

diff --git a/CyteKit/WebView.mm b/CyteKit/WebView.mm
index 66304630ef631326063a44423080474045450b63..3711587483856b99d0dc4a300416d1c1d7940f87 100644 (file)
--- a/CyteKit/WebView.mm
+++ b/CyteKit/WebView.mm
@@ -1,5 +1,5 @@
 /* Cydia - iPhone UIKit Front-End for Debian APT
 /* Cydia - iPhone UIKit Front-End for Debian APT

- * Copyright (C) 2008-2014  Jay Freeman (saurik)
+ * Copyright (C) 2008-2015  Jay Freeman (saurik)

 */
 
 /* GNU General Public License, Version 3 {{{ */
 */
 
 /* GNU General Public License, Version 3 {{{ */


@@ -19,10 +19,12 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

+#include "CyteKit/UCPlatform.h"
+

 #include "CyteKit/dispatchEvent.h"
 #include "CyteKit/WebView.h"
 
 #include "CyteKit/dispatchEvent.h"
 #include "CyteKit/WebView.h"
 

-#include <CydiaSubstrate/CydiaSubstrate.h>
+#include "Substrate.hpp"

 
 #include "iPhonePrivate.h"
 
 
 #include "iPhonePrivate.h"
 


@@ -88,7 +90,8 @@
 @end
 // }}}
 
 @end
 // }}}
 

-@implementation CyteWebView : UIWebView
+@implementation CyteWebView : UIWebView {
+}

 
 #if ShowInternals
 #include "CyteKit/UCInternal.h"
 
 #if ShowInternals
 #include "CyteKit/UCInternal.h"


@@ -295,6 +298,16 @@ static NSURLRequest *$UIWebViewWebViewDelegate$webView$resource$willSendRequest$
     return request;
 }
 // }}}
     return request;
 }
 // }}}

+// webThreadWebView:resource:willSendRequest:redirectResponse:fromDataSource: {{{
+- (NSURLRequest *) webThreadWebView:(WebView *)view resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source {
+    id<CyteWebViewDelegate> delegate([self delegate]);
+    if ([UIWebView instancesRespondToSelector:@selector(webThreadWebView:resource:willSendRequest:redirectResponse:fromDataSource:)])
+        request = [super webThreadWebView:view resource:identifier willSendRequest:request redirectResponse:response fromDataSource:source];
+    if ([delegate respondsToSelector:@selector(webThreadWebView:resource:willSendRequest:redirectResponse:fromDataSource:)])
+        request = [delegate webThreadWebView:view resource:identifier willSendRequest:request redirectResponse:response fromDataSource:source];
+    return request;
+}
+// }}}

 // webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame: (2.1+) {{{
 - (void) webView:(WebView *)view runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame {
     [[self retain] autorelease];
 // webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame: (2.1+) {{{
 - (void) webView:(WebView *)view runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame {
     [[self retain] autorelease];