Seriously solve the auto-redirect issue.

diff --git a/CyteKit/WebViewController.h b/CyteKit/WebViewController.h
index d779468a6a9df62febd24f6ac9cfd50ce517f0e7..2bd5320fdcc243d26a22661bb61705bdd86943d7 100644 (file)
--- a/CyteKit/WebViewController.h
+++ b/CyteKit/WebViewController.h
@@ -73,9 +73,6 @@
     _H<NSURLRequest> request_;
     bool ready_;
 
     _H<NSURLRequest> request_;
     bool ready_;
 

-    _H<NSURLRequest> stage1_;
-    _H<NSURLRequest> stage2_;
-

     _transient NSNumber *sensitive_;
 
     _H<NSString> title_;
     _transient NSNumber *sensitive_;
 
     _H<NSString> title_;

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index 40cd6d1fc8eb39cb97b30a3358e0b84428963918..d347a3963f5667193e75c0b41e96bb8f389f58a3 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -354,9 +354,7 @@ float CYScrollViewDecelerationRateNormal;
         return;
 
     if ([[error domain] isEqualToString:WebKitErrorDomain] && [error code] == WebKitErrorFrameLoadInterruptedByPolicyChange) {
         return;
 
     if ([[error domain] isEqualToString:WebKitErrorDomain] && [error code] == WebKitErrorFrameLoadInterruptedByPolicyChange) {

-        request_ = stage2_;
-        stage1_ = nil;
-        stage2_ = nil;
+        request_ = nil;

         return;
     }
 
         return;
     }
 


@@ -441,10 +439,8 @@ float CYScrollViewDecelerationRateNormal;
 - (void) webView:(WebView *)view didDecidePolicy:(CYWebPolicyDecision)decision forNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame {
     if ([frame parentFrame] == nil)
         if (decision == CYWebPolicyDecisionUse)
 - (void) webView:(WebView *)view didDecidePolicy:(CYWebPolicyDecision)decision forNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame {
     if ([frame parentFrame] == nil)
         if (decision == CYWebPolicyDecisionUse)

-            if (!error_) {
-                stage1_ = request_;
+            if (!error_)

                 request_ = request;
                 request_ = request;

-            }

 }
 
 - (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
 }
 
 - (void) webView:(WebView *)view decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {


@@ -502,9 +498,6 @@ float CYScrollViewDecelerationRateNormal;
     [loading_ removeObject:[NSValue valueWithNonretainedObject:frame]];
 
     if ([frame parentFrame] == nil) {
     [loading_ removeObject:[NSValue valueWithNonretainedObject:frame]];
 
     if ([frame parentFrame] == nil) {

-        stage1_ = nil;
-        stage2_ = nil;
-

         if (DOMDocument *document = [frame DOMDocument])
             if (DOMNodeList<NSFastEnumeration> *bodies = [document getElementsByTagName:@"body"])
                 for (DOMHTMLBodyElement *body in (id) bodies) {
         if (DOMDocument *document = [frame DOMDocument])
             if (DOMNodeList<NSFastEnumeration> *bodies = [document getElementsByTagName:@"body"])
                 for (DOMHTMLBodyElement *body in (id) bodies) {


@@ -565,9 +558,6 @@ float CYScrollViewDecelerationRateNormal;
 
         allowsNavigationAction_ = true;
 
 
         allowsNavigationAction_ = true;
 

-        stage2_ = stage1_;
-        stage1_ = nil;
-

         [self setHidesNavigationBar:NO];
 
         // XXX: do we still need to do this?
         [self setHidesNavigationBar:NO];
 
         // XXX: do we still need to do this?