Fix Cydia's popup blocking (broken since iOS 4.2).

[cydia.git] / CyteKit / WebViewController.mm

diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm
index 76379fb61f9ac1f2ea17289196f87a04d78d4710..7d91177f9fee707b11557902274f29f1da966393 100644 (file)
--- a/CyteKit/WebViewController.mm
+++ b/CyteKit/WebViewController.mm
@@ -5,6 +5,7 @@
 
 #include "iPhonePrivate.h"
 
 
 #include "iPhonePrivate.h"
 

+#include "CyteKit/IndirectDelegate.h"

 #include "CyteKit/Localize.h"
 #include "CyteKit/WebViewController.h"
 #include "CyteKit/PerlCompatibleRegEx.hpp"
 #include "CyteKit/Localize.h"
 #include "CyteKit/WebViewController.h"
 #include "CyteKit/PerlCompatibleRegEx.hpp"


@@ -16,8 +17,8 @@ extern NSString * const kCAFilterNearest;
 
 #include <WebCore/WebCoreThread.h>
 
 
 #include <WebCore/WebCoreThread.h>
 

-#include <WebKit/WebKitErrors.h>
-#include <WebKit/WebPreferences.h>
+#import <WebKit/WebKitErrors.h>
+#import <WebKit/WebPreferences.h>

 
 #include <WebKit/DOMCSSPrimitiveValue.h>
 #include <WebKit/DOMCSSStyleDeclaration.h>
 
 #include <WebKit/DOMCSSPrimitiveValue.h>
 #include <WebKit/DOMCSSStyleDeclaration.h>


@@ -37,33 +38,40 @@ extern NSString * const kCAFilterNearest;
 
 #define lprintf(args...) fprintf(stderr, args)
 
 
 #define lprintf(args...) fprintf(stderr, args)
 

+JSValueRef (*$JSObjectCallAsFunction)(JSContextRef, JSObjectRef, JSObjectRef, size_t, const JSValueRef[], JSValueRef *);
+

 // XXX: centralize these special class things to some file or mechanism?
 static Class $MFMailComposeViewController;
 
 float CYScrollViewDecelerationRateNormal;
 
 // XXX: centralize these special class things to some file or mechanism?
 static Class $MFMailComposeViewController;
 
 float CYScrollViewDecelerationRateNormal;
 

-@interface WebView (Apple)
-- (void) _setLayoutInterval:(float)interval;
-- (void) _setAllowsMessaging:(BOOL)allows;
+@interface WebFrame (Cydia)
+- (void) cydia$updateHeight;

 @end
 
 @end
 

-@interface WebPreferences (Apple)
-+ (void) _setInitialDefaultTextEncodingToSystemEncoding;
-- (void) _setLayoutInterval:(NSInteger)interval;
-- (void) setOfflineWebApplicationCacheEnabled:(BOOL)enabled;
-@end
+@implementation WebFrame (Cydia)

 
 

-/* Indirect Delegate {{{ */
-@interface IndirectDelegate : NSObject {
-    _transient volatile id delegate_;
+- (NSString *) description {
+    return [NSString stringWithFormat:@"<%s: %p, %@>", class_getName([self class]), self, [[[([self provisionalDataSource] ?: [self dataSource]) request] URL] absoluteString]];
+}
+
+- (void) cydia$updateHeight {
+    [[[self frameElement] style]
+        setProperty:@"height"
+        value:[NSString stringWithFormat:@"%dpx",
+            [[[self DOMDocument] body] scrollHeight]]
+        priority:nil];

 }
 
 }
 

-- (void) setDelegate:(id)delegate;
-- (id) initWithDelegate:(id)delegate;

 @end
 
 @end
 

+/* Indirect Delegate {{{ */

 @implementation IndirectDelegate
 
 @implementation IndirectDelegate
 

+- (id) delegate {
+    return delegate_;
+}
+

 - (void) setDelegate:(id)delegate {
     delegate_ = delegate;
 }
 - (void) setDelegate:(id)delegate {
     delegate_ = delegate;
 }


@@ -127,6 +135,14 @@ float CYScrollViewDecelerationRateNormal;
 + (void) _initialize {
     [WebPreferences _setInitialDefaultTextEncodingToSystemEncoding];
 
 + (void) _initialize {
     [WebPreferences _setInitialDefaultTextEncodingToSystemEncoding];
 

+    void *js(NULL);
+    if (js == NULL)
+        js = dlopen("/System/Library/Frameworks/JavaScriptCore.framework/JavaScriptCore", RTLD_GLOBAL | RTLD_LAZY);
+    if (js == NULL)
+        js = dlopen("/System/Library/PrivateFrameworks/JavaScriptCore.framework/JavaScriptCore", RTLD_GLOBAL | RTLD_LAZY);
+    if (js != NULL)
+        $JSObjectCallAsFunction = reinterpret_cast<JSValueRef (*)(JSContextRef, JSObjectRef, JSObjectRef, size_t, const JSValueRef[], JSValueRef *)>(dlsym(js, "JSObjectCallAsFunction"));
+

     dlopen("/System/Library/Frameworks/MessageUI.framework/MessageUI", RTLD_GLOBAL | RTLD_LAZY);
     $MFMailComposeViewController = objc_getClass("MFMailComposeViewController");
 
     dlopen("/System/Library/Frameworks/MessageUI.framework/MessageUI", RTLD_GLOBAL | RTLD_LAZY);
     $MFMailComposeViewController = objc_getClass("MFMailComposeViewController");
 


@@ -136,17 +152,33 @@ float CYScrollViewDecelerationRateNormal;
         CYScrollViewDecelerationRateNormal = 0.998;
 }
 
         CYScrollViewDecelerationRateNormal = 0.998;
 }
 

+- (bool) retainsNetworkActivityIndicator {
+    return true;
+}
+
+- (void) releaseNetworkActivityIndicator {
+    if ([loading_ count] != 0) {
+        [loading_ removeAllObjects];
+
+        if ([self retainsNetworkActivityIndicator])
+            [delegate_ releaseNetworkActivityIndicator];
+    }
+}
+

 - (void) dealloc {
 #if LogBrowser
     NSLog(@"[CyteWebViewController dealloc]");
 #endif
 
 - (void) dealloc {
 #if LogBrowser
     NSLog(@"[CyteWebViewController dealloc]");
 #endif
 

-    if ([loading_ count] != 0)
-        [delegate_ releaseNetworkActivityIndicator];
+    [self releaseNetworkActivityIndicator];

 
     [super dealloc];
 }
 
 
     [super dealloc];
 }
 

+- (NSString *) description {
+    return [NSString stringWithFormat:@"<%s: %p, %@>", class_getName([self class]), self, [[request_ URL] absoluteString]];
+}
+

 - (CyteWebView *) webView {
     return (CyteWebView *) [self view];
 }
 - (CyteWebView *) webView {
     return (CyteWebView *) [self view];
 }


@@ -155,21 +187,33 @@ float CYScrollViewDecelerationRateNormal;
     return url;
 }
 
     return url;
 }
 

-- (NSURLRequest *) requestWithURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy {
-    return [NSURLRequest
+- (NSURLRequest *) requestWithURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy referrer:(NSString *)referrer {
+    NSMutableURLRequest *request([NSMutableURLRequest

         requestWithURL:[self URLWithURL:url]
         cachePolicy:policy
         timeoutInterval:DefaultTimeout_
         requestWithURL:[self URLWithURL:url]
         cachePolicy:policy
         timeoutInterval:DefaultTimeout_

-    ];
+    ]);
+
+    [request setValue:referrer forHTTPHeaderField:@"Referer"];
+
+    return request;

 }
 
 }
 

-- (void) setURL:(NSURL *)url {
+- (void) setRequest:(NSURLRequest *)request {

     _assert(request_ == nil);
     _assert(request_ == nil);

-    request_ = [self requestWithURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy];
+    request_ = request;
+}
+
+- (void) setURL:(NSURL *)url {
+    [self setURL:url withReferrer:nil];
+}
+
+- (void) setURL:(NSURL *)url withReferrer:(NSString *)referrer {
+    [self setRequest:[self requestWithURL:url cachePolicy:NSURLRequestUseProtocolCachePolicy referrer:referrer]];

 }
 
 - (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy {
 }
 
 - (void) loadURL:(NSURL *)url cachePolicy:(NSURLRequestCachePolicy)policy {

-    [self loadRequest:[self requestWithURL:url cachePolicy:policy]];
+    [self loadRequest:[self requestWithURL:url cachePolicy:policy referrer:nil]];

 }
 
 - (void) loadURL:(NSURL *)url {
 }
 
 - (void) loadURL:(NSURL *)url {


@@ -197,7 +241,7 @@ float CYScrollViewDecelerationRateNormal;
 
     request_ = request;
 
 
     request_ = request;
 

-    if ([request_ HTTPBody] == nil && [request_ HTTPBodyStream] == nil)
+    if (cache || [request_ HTTPBody] == nil && [request_ HTTPBodyStream] == nil)

         [self loadRequest:request_];
     else {
         UIAlertView *alert = [[[UIAlertView alloc]
         [self loadRequest:request_];
     else {
         UIAlertView *alert = [[[UIAlertView alloc]


@@ -215,10 +259,6 @@ float CYScrollViewDecelerationRateNormal;
     }
 }
 
     }
 }
 

-- (void) reloadURL {
-    [self reloadURLWithCache:YES];
-}
-

 - (void) reloadData {
     [super reloadData];
 
 - (void) reloadData {
     [super reloadData];
 


@@ -331,16 +371,18 @@ float CYScrollViewDecelerationRateNormal;
 }
 
 - (void) _didFailWithError:(NSError *)error forFrame:(WebFrame *)frame {
 }
 
 - (void) _didFailWithError:(NSError *)error forFrame:(WebFrame *)frame {

-    [loading_ removeObject:[NSValue valueWithNonretainedObject:frame]];
+    NSValue *object([NSValue valueWithNonretainedObject:frame]);
+    if (![loading_ containsObject:object])
+        return;
+    [loading_ removeObject:object];
+

     [self _didFinishLoading];
 
     if ([[error domain] isEqualToString:NSURLErrorDomain] && [error code] == NSURLErrorCancelled)
         return;
 
     if ([[error domain] isEqualToString:WebKitErrorDomain] && [error code] == WebKitErrorFrameLoadInterruptedByPolicyChange) {
     [self _didFinishLoading];
 
     if ([[error domain] isEqualToString:NSURLErrorDomain] && [error code] == NSURLErrorCancelled)
         return;
 
     if ([[error domain] isEqualToString:WebKitErrorDomain] && [error code] == WebKitErrorFrameLoadInterruptedByPolicyChange) {

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

         return;
     }
 
         return;
     }
 


@@ -354,19 +396,29 @@ float CYScrollViewDecelerationRateNormal;
     }
 }
 
     }
 }
 

-- (void) pushRequest:(NSURLRequest *)request asPop:(bool)pop {
+- (void) pushRequest:(NSURLRequest *)request forAction:(NSDictionary *)action asPop:(bool)pop {
+    WebFrame *frame(nil);
+    if (NSDictionary *WebActionElement = [action objectForKey:@"WebActionElementKey"])
+        frame = [WebActionElement objectForKey:@"WebElementFrame"];
+    if (frame == nil)
+        frame = [[[[self webView] _documentView] webView] mainFrame];
+
+    WebDataSource *source([frame provisionalDataSource] ?: [frame dataSource]);
+    NSString *referrer([request valueForHTTPHeaderField:@"Referer"] ?: [[[source request] URL] absoluteString]);
+

     NSURL *url([request URL]);
 
     // XXX: filter to internal usage?
     NSURL *url([request URL]);
 
     // XXX: filter to internal usage?

-    CyteViewController *page([delegate_ pageForURL:url forExternal:NO]);
+    CyteViewController *page([delegate_ pageForURL:url forExternal:NO withReferrer:referrer]);

 
     if (page == nil) {
         CyteWebViewController *browser([[[class_ alloc] init] autorelease]);
 
     if (page == nil) {
         CyteWebViewController *browser([[[class_ alloc] init] autorelease]);

-        [browser loadRequest:request];
+        [browser setRequest:request];

         page = browser;
     }
 
     [page setDelegate:delegate_];
         page = browser;
     }
 
     [page setDelegate:delegate_];

+    [page setPageColor:color_];

 
     if (!pop) {
         [[self navigationItem] setTitle:title_];
 
     if (!pop) {
         [[self navigationItem] setTitle:title_];


@@ -406,7 +458,7 @@ float CYScrollViewDecelerationRateNormal;
 
 - (void) webView:(WebView *)view decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
 #if LogBrowser
 
 - (void) webView:(WebView *)view decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
 #if LogBrowser

-    NSLog(@"decidePolicyForNavigationAction:%@ request:%@ frame:%@", action, request, frame);
+    NSLog(@"decidePolicyForNavigationAction:%@ request:%@ %@ frame:%@", action, request, [request allHTTPHeaderFields], frame);

 #endif
 
     if ([frame parentFrame] == nil) {
 #endif
 
     if ([frame parentFrame] == nil) {


@@ -415,7 +467,7 @@ float CYScrollViewDecelerationRateNormal;
 
             if (request_ != nil && ![[request_ URL] isEqual:url] && ![self allowsNavigationAction]) {
                 if (url != nil)
 
             if (request_ != nil && ![[request_ URL] isEqual:url] && ![self allowsNavigationAction]) {
                 if (url != nil)

-                    [self pushRequest:request asPop:NO];
+                    [self pushRequest:request forAction:action asPop:NO];

                 [listener ignore];
             }
         }
                 [listener ignore];
             }
         }


@@ -423,37 +475,64 @@ float CYScrollViewDecelerationRateNormal;
 }
 
 - (void) webView:(WebView *)view didDecidePolicy:(CYWebPolicyDecision)decision forNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame {
 }
 
 - (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_;
-                request_ = request;
-            }
+#if LogBrowser
+    NSLog(@"didDecidePolicy:%u forNavigationAction:%@ request:%@ frame:%@", decision, action, request, [request allHTTPHeaderFields], frame);
+#endif
+
+    if ([frame parentFrame] == nil) {
+        switch (decision) {
+            case CYWebPolicyDecisionIgnore:
+                if ([[request_ URL] isEqual:[request URL]])
+                    request_ = nil;
+            break;
+
+            case CYWebPolicyDecisionUse:
+                if (!error_)
+                    request_ = request;
+            break;
+
+            default:
+            break;
+        }
+    }

 }
 
 }
 

-- (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 *)name decisionListener:(id<WebPolicyDecisionListener>)listener {

 #if LogBrowser
 #if LogBrowser

-    NSLog(@"decidePolicyForNewWindowAction:%@ request:%@ newFrameName:%@", action, request, frame);
+    NSLog(@"decidePolicyForNewWindowAction:%@ request:%@ %@ newFrameName:%@", action, request, [request allHTTPHeaderFields], name);

 #endif
 
     NSURL *url([request URL]);
     if (url == nil)
         return;
 
 #endif
 
     NSURL *url([request URL]);
     if (url == nil)
         return;
 

-    if ([frame isEqualToString:@"_open"])
+    if ([name isEqualToString:@"_open"])

         [delegate_ openURL:url];
     else {
         NSString *scheme([[url scheme] lowercaseString]);
         if ([scheme isEqualToString:@"mailto"])
             [self _openMailToURL:url];
         else
         [delegate_ openURL:url];
     else {
         NSString *scheme([[url scheme] lowercaseString]);
         if ([scheme isEqualToString:@"mailto"])
             [self _openMailToURL:url];
         else

-            [self pushRequest:request asPop:[frame isEqualToString:@"_popup"]];
+            [self pushRequest:request forAction:action asPop:[name isEqualToString:@"_popup"]];

     }
 
     [listener ignore];
 }
 
 - (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
     }
 
     [listener ignore];
 }
 
 - (void) webView:(WebView *)view didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {

+#if LogBrowser
+    NSLog(@"didClearWindowObject:%@ forFrame:%@", window, frame);
+#endif
+}
+
+- (void) webView:(WebView *)view didCommitLoadForFrame:(WebFrame *)frame {
+#if LogBrowser
+    NSLog(@"didCommitLoadForFrame:%@", frame);
+#endif
+
+    if ([frame parentFrame] == nil) {
+        loaded_ = true;
+    }

 }
 
 - (void) webView:(WebView *)view didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {
 }
 
 - (void) webView:(WebView *)view didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame {


@@ -473,14 +552,14 @@ float CYScrollViewDecelerationRateNormal;
 }
 
 - (void) webView:(WebView *)view didFinishLoadForFrame:(WebFrame *)frame {
 }
 
 - (void) webView:(WebView *)view didFinishLoadForFrame:(WebFrame *)frame {

-    [loading_ removeObject:[NSValue valueWithNonretainedObject:frame]];
+    NSValue *object([NSValue valueWithNonretainedObject:frame]);
+    if (![loading_ containsObject:object])
+        return;
+    [loading_ removeObject:object];

 
     if ([frame parentFrame] == nil) {
 
     if ([frame parentFrame] == nil) {

-        stage1_ = nil;
-        stage2_ = nil;
-

         if (DOMDocument *document = [frame DOMDocument])
         if (DOMDocument *document = [frame DOMDocument])

-            if (DOMNodeList<NSFastEnumeration> *bodies = [document getElementsByTagName:@"body"])
+            if (DOMNodeList *bodies = [document getElementsByTagName:@"body"])

                 for (DOMHTMLBodyElement *body in (id) bodies) {
                     DOMCSSStyleDeclaration *style([document getComputedStyle:body pseudoElement:nil]);
 
                 for (DOMHTMLBodyElement *body in (id) bodies) {
                     DOMCSSStyleDeclaration *style([document getComputedStyle:body pseudoElement:nil]);
 


@@ -495,9 +574,7 @@ float CYScrollViewDecelerationRateNormal;
                             float blue([[rgb blue] getFloatValue:DOM_CSS_NUMBER]);
                             float alpha([[rgb alpha] getFloatValue:DOM_CSS_NUMBER]);
 
                             float blue([[rgb blue] getFloatValue:DOM_CSS_NUMBER]);
                             float alpha([[rgb alpha] getFloatValue:DOM_CSS_NUMBER]);
 

-                            if (red == 0xc7 && green == 0xce && blue == 0xd5)
-                                uic = [UIColor pinStripeColor];
-                            else if (alpha != 0)
+                            if (alpha == 1)

                                 uic = [UIColor
                                     colorWithRed:(red / 255)
                                     green:(green / 255)
                                 uic = [UIColor
                                     colorWithRed:(red / 255)
                                     green:(green / 255)


@@ -507,7 +584,8 @@ float CYScrollViewDecelerationRateNormal;
                         }
                     }
 
                         }
                     }
 

-                    [scroller_ setBackgroundColor:(uic ?: [UIColor clearColor])];
+                    [super setPageColor:uic];
+                    [scroller_ setBackgroundColor:color_];

                     break;
                 }
     }
                     break;
                 }
     }


@@ -537,12 +615,14 @@ float CYScrollViewDecelerationRateNormal;
         style_ = nil;
         function_ = nil;
 
         style_ = nil;
         function_ = nil;
 

-        allowsNavigationAction_ = true;
+        [registered_ removeAllObjects];
+        timer_ = nil;

 
 

-        stage2_ = stage1_;
-        stage1_ = nil;
+        allowsNavigationAction_ = true;

 
         [self setHidesNavigationBar:NO];
 
         [self setHidesNavigationBar:NO];

+        [self setScrollAlwaysBounceVertical:true];
+        [self setScrollIndicatorStyle:UIScrollViewIndicatorStyleDefault];

 
         // XXX: do we still need to do this?
         [[self navigationItem] setTitle:nil];
 
         // XXX: do we still need to do this?
         [[self navigationItem] setTitle:nil];


@@ -551,6 +631,49 @@ float CYScrollViewDecelerationRateNormal;
     [self _didStartLoading];
 }
 
     [self _didStartLoading];
 }
 

+- (void) webView:(WebView *)view resource:(id)identifier didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)source {
+    challenge_ = [challenge retain];
+
+    NSURLProtectionSpace *space([challenge protectionSpace]);
+    NSString *realm([space realm]);
+    if (realm == nil)
+        realm = @"";
+
+    UIAlertView *alert = [[[UIAlertView alloc]
+        initWithTitle:realm
+        message:nil
+        delegate:self
+        cancelButtonTitle:UCLocalize("CANCEL")
+        otherButtonTitles:UCLocalize("LOGIN"), nil
+    ] autorelease];
+
+    [alert setContext:@"challenge"];
+    [alert setNumberOfRows:1];
+
+    [alert addTextFieldWithValue:@"" label:UCLocalize("USERNAME")];
+    [alert addTextFieldWithValue:@"" label:UCLocalize("PASSWORD")];
+
+    UITextField *username([alert textFieldAtIndex:0]); {
+        UITextInputTraits *traits([username textInputTraits]);
+        [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
+        [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
+        [traits setKeyboardType:UIKeyboardTypeASCIICapable];
+        [traits setReturnKeyType:UIReturnKeyNext];
+    }
+
+    UITextField *password([alert textFieldAtIndex:1]); {
+        UITextInputTraits *traits([password textInputTraits]);
+        [traits setAutocapitalizationType:UITextAutocapitalizationTypeNone];
+        [traits setAutocorrectionType:UITextAutocorrectionTypeNo];
+        [traits setKeyboardType:UIKeyboardTypeASCIICapable];
+        // XXX: UIReturnKeyDone
+        [traits setReturnKeyType:UIReturnKeyNext];
+        [traits setSecureTextEntry:YES];
+    }
+
+    [alert show];
+}
+

 - (NSURLRequest *) webView:(WebView *)view resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source {
 #if LogBrowser
     NSLog(@"resource:%@ willSendRequest:%@ redirectResponse:%@ fromDataSource:%@", identifier, request, response, source);
 - (NSURLRequest *) webView:(WebView *)view resource:(id)identifier willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response fromDataSource:(WebDataSource *)source {
 #if LogBrowser
     NSLog(@"resource:%@ willSendRequest:%@ redirectResponse:%@ fromDataSource:%@", identifier, request, response, source);


@@ -577,7 +700,7 @@ float CYScrollViewDecelerationRateNormal;
 // }}}
 
 - (void) close {
 // }}}
 
 - (void) close {

-    [[self navigationController] dismissModalViewControllerAnimated:YES];
+    [[[self navigationController] parentOrPresentingViewController] dismissModalViewControllerAnimated:YES];

 }
 
 - (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button {
 }
 
 - (void) alertView:(UIAlertView *)alert clickedButtonAtIndex:(NSInteger)button {


@@ -598,21 +721,15 @@ float CYScrollViewDecelerationRateNormal;
     } else if ([context isEqualToString:@"challenge"]) {
         id<NSURLAuthenticationChallengeSender> sender([challenge_ sender]);
 
     } else if ([context isEqualToString:@"challenge"]) {
         id<NSURLAuthenticationChallengeSender> sender([challenge_ sender]);
 

-        switch (button) {
-            case 1: {
-                NSString *username([[alert textFieldAtIndex:0] text]);
-                NSString *password([[alert textFieldAtIndex:1] text]);
-
-                NSURLCredential *credential([NSURLCredential credentialWithUser:username password:password persistence:NSURLCredentialPersistenceForSession]);
-
-                [sender useCredential:credential forAuthenticationChallenge:challenge_];
-            } break;
+        if (button == [alert cancelButtonIndex])
+            [sender cancelAuthenticationChallenge:challenge_];
+        else if (button == [alert firstOtherButtonIndex]) {
+            NSString *username([[alert textFieldAtIndex:0] text]);
+            NSString *password([[alert textFieldAtIndex:1] text]);

 
 

-            case 2:
-                [sender cancelAuthenticationChallenge:challenge_];
-            break;
+            NSURLCredential *credential([NSURLCredential credentialWithUser:username password:password persistence:NSURLCredentialPersistenceForSession]);

 
 

-            _nodefault
+            [sender useCredential:credential forAuthenticationChallenge:challenge_];

         }
 
         challenge_ = nil;
         }
 
         challenge_ = nil;


@@ -644,7 +761,7 @@ float CYScrollViewDecelerationRateNormal;
 - (UIBarButtonItem *) customButton {
     if (custom_ == nil)
         return nil;
 - (UIBarButtonItem *) customButton {
     if (custom_ == nil)
         return nil;

-    else if (custom_ == [NSNull null])
+    else if ((/*clang:*/id) custom_ == [NSNull null])

         return (UIBarButtonItem *) [NSNull null];
 
     return [[[UIBarButtonItem alloc]
         return (UIBarButtonItem *) [NSNull null];
 
     return [[[UIBarButtonItem alloc]


@@ -661,7 +778,7 @@ float CYScrollViewDecelerationRateNormal;
         return nil;
 
     if (UINavigationController *navigation = [self navigationController])
         return nil;
 
     if (UINavigationController *navigation = [self navigationController])

-        if ([[navigation parentViewController] modalViewController] == navigation)
+        if ([[navigation parentOrPresentingViewController] modalViewController] == navigation)

             return [[[UIBarButtonItem alloc]
                 initWithTitle:UCLocalize("CLOSE")
                 style:UIBarButtonItemStylePlain
             return [[[UIBarButtonItem alloc]
                 initWithTitle:UCLocalize("CLOSE")
                 style:UIBarButtonItemStylePlain


@@ -719,7 +836,9 @@ float CYScrollViewDecelerationRateNormal;
     if ([loading_ count] != 1)
         return;
 
     if ([loading_ count] != 1)
         return;
 

-    [delegate_ retainNetworkActivityIndicator];
+    if ([self retainsNetworkActivityIndicator])
+        [delegate_ retainNetworkActivityIndicator];
+

     [self didStartLoading];
 }
 
     [self didStartLoading];
 }
 


@@ -734,7 +853,9 @@ float CYScrollViewDecelerationRateNormal;
     [self applyRightButton];
     [[self navigationItem] setTitle:title_];
 
     [self applyRightButton];
     [[self navigationItem] setTitle:title_];
 

-    [delegate_ releaseNetworkActivityIndicator];
+    if ([self retainsNetworkActivityIndicator])
+        [delegate_ releaseNetworkActivityIndicator];
+

     [self didFinishLoading];
 }
 
     [self didFinishLoading];
 }
 


@@ -747,9 +868,12 @@ float CYScrollViewDecelerationRateNormal;
         width_ = width;
         class_ = _class;
 
         width_ = width;
         class_ = _class;
 

+        [super setPageColor:nil];
+

         allowsNavigationAction_ = true;
 
         loading_ = [NSMutableSet setWithCapacity:5];
         allowsNavigationAction_ = true;
 
         loading_ = [NSMutableSet setWithCapacity:5];

+        registered_ = [NSMutableSet setWithCapacity:5];

         indirect_ = [[[IndirectDelegate alloc] initWithDelegate:self] autorelease];
 
         reloaditem_ = [[[UIBarButtonItem alloc]
         indirect_ = [[[IndirectDelegate alloc] initWithDelegate:self] autorelease];
 
         reloaditem_ = [[[UIBarButtonItem alloc]


@@ -760,14 +884,24 @@ float CYScrollViewDecelerationRateNormal;
         ] autorelease];
 
         loadingitem_ = [[[UIBarButtonItem alloc]
         ] autorelease];
 
         loadingitem_ = [[[UIBarButtonItem alloc]

-            initWithTitle:@" "
+            initWithTitle:(kCFCoreFoundationVersionNumber >= 800 ? @"       " : @" ")

             style:UIBarButtonItemStylePlain
             target:self
             action:@selector(reloadButtonClicked)
         ] autorelease];
 
             style:UIBarButtonItemStylePlain
             target:self
             action:@selector(reloadButtonClicked)
         ] autorelease];
 

-        indicator_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite] autorelease];
-        [indicator_ setFrame:CGRectMake(15, 5, [indicator_ frame].size.width, [indicator_ frame].size.height)];
+        UIActivityIndicatorViewStyle style;
+        float left;
+        if (kCFCoreFoundationVersionNumber >= 800) {
+            style = UIActivityIndicatorViewStyleGray;
+            left = 7;
+        } else {
+            style = UIActivityIndicatorViewStyleWhite;
+            left = 15;
+        }
+
+        indicator_ = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:style] autorelease];
+        [indicator_ setFrame:CGRectMake(left, 5, [indicator_ frame].size.width, [indicator_ frame].size.height)];

         [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
 
         [self applyLeftButton];
         [indicator_ setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin];
 
         [self applyLeftButton];


@@ -798,11 +932,6 @@ float CYScrollViewDecelerationRateNormal;
     // XXX: I think this improves scrolling; the hardcoded-ness sucks
     [document setTileSize:CGSizeMake(320, 500)];
 
     // XXX: I think this improves scrolling; the hardcoded-ness sucks
     [document setTileSize:CGSizeMake(320, 500)];
 

-    [document setBackgroundColor:[UIColor clearColor]];
-
-    // XXX: this is terribly (too?) expensive
-    [document setDrawsBackground:NO];
-

     WebView *webview([document webView]);
     WebPreferences *preferences([webview preferences]);
 
     WebView *webview([document webView]);
     WebPreferences *preferences([webview preferences]);
 


@@ -813,8 +942,10 @@ float CYScrollViewDecelerationRateNormal;
         [preferences _setLayoutInterval:0];
 
     [preferences setCacheModel:WebCacheModelDocumentBrowser];
         [preferences _setLayoutInterval:0];
 
     [preferences setCacheModel:WebCacheModelDocumentBrowser];

-    [preferences setJavaScriptCanOpenWindowsAutomatically:YES];
-    [preferences setOfflineWebApplicationCacheEnabled:YES];
+    [preferences setJavaScriptCanOpenWindowsAutomatically:NO];
+
+    if ([preferences respondsToSelector:@selector(setOfflineWebApplicationCacheEnabled:)])
+        [preferences setOfflineWebApplicationCacheEnabled:YES];

 
     if (NSString *agent = [self applicationNameForUserAgent])
         [webview setApplicationNameForUserAgent:agent];
 
     if (NSString *agent = [self applicationNameForUserAgent])
         [webview setApplicationNameForUserAgent:agent];


@@ -855,8 +986,11 @@ float CYScrollViewDecelerationRateNormal;
         //[scroller setAllowsRubberBanding:YES];
     }
 
         //[scroller setAllowsRubberBanding:YES];
     }
 

+    [webview_ setOpaque:NO];
+    [webview_ setBackgroundColor:nil];
+

     [scroller_ setFixedBackgroundPattern:YES];
     [scroller_ setFixedBackgroundPattern:YES];

-    [scroller_ setBackgroundColor:[UIColor clearColor]];
+    [scroller_ setBackgroundColor:color_];

     [scroller_ setClipsSubviews:YES];
 
     [scroller_ setBounces:YES];
     [scroller_ setClipsSubviews:YES];
 
     [scroller_ setBounces:YES];


@@ -865,10 +999,13 @@ float CYScrollViewDecelerationRateNormal;
 
     [self setViewportWidth:width_];
 
 
     [self setViewportWidth:width_];
 

-    UITableView *table([[[UITableView alloc] initWithFrame:[webview_ bounds] style:UITableViewStyleGrouped] autorelease]);
-    [webview_ insertSubview:table atIndex:0];
+    if ([[UIColor groupTableViewBackgroundColor] isEqual:[UIColor clearColor]]) {
+        UITableView *table([[[UITableView alloc] initWithFrame:[webview_ bounds] style:UITableViewStyleGrouped] autorelease]);
+        [table setScrollsToTop:NO];
+        [webview_ insertSubview:table atIndex:0];
+        [table setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
+    }

 
 

-    [table setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];

     [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
 
     ready_ = false;
     [webview_ setAutoresizingMask:(UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight)];
 
     ready_ = false;


@@ -878,6 +1015,8 @@ float CYScrollViewDecelerationRateNormal;
     webview_ = nil;
     scroller_ = nil;
 
     webview_ = nil;
     scroller_ = nil;
 

+    [self releaseNetworkActivityIndicator];
+

     [super releaseSubviews];
 }
 
     [super releaseSubviews];
 }
 


@@ -895,19 +1034,44 @@ float CYScrollViewDecelerationRateNormal;
     } return self;
 }
 
     } return self;
 }
 

+- (id) initWithRequest:(NSURLRequest *)request {
+    if ((self = [self init]) != nil) {
+        [self setRequest:request];
+    } return self;
+}
+
++ (void) _lockJavaScript:(WebPreferences *)preferences {
+    WebThreadLocked lock;
+    [preferences setJavaScriptCanOpenWindowsAutomatically:NO];
+}
+

 - (void) callFunction:(WebScriptObject *)function {
     WebThreadLocked lock;
 
     WebView *webview([[[self webView] _documentView] webView]);
 - (void) callFunction:(WebScriptObject *)function {
     WebThreadLocked lock;
 
     WebView *webview([[[self webView] _documentView] webView]);

-    WebFrame *frame([webview mainFrame]);
+    WebPreferences *preferences([webview preferences]);

 
 

+    [preferences setJavaScriptCanOpenWindowsAutomatically:YES];
+    if ([webview respondsToSelector:@selector(_preferencesChanged:)])
+        [webview _preferencesChanged:preferences];
+    else
+        [webview _preferencesChangedNotification:[NSNotification notificationWithName:@"" object:preferences]];
+
+    WebFrame *frame([webview mainFrame]);

     JSGlobalContextRef context([frame globalContext]);
     JSGlobalContextRef context([frame globalContext]);

+

     JSObjectRef object([function JSObject]);
     JSObjectRef object([function JSObject]);

-    JSObjectCallAsFunction(context, object, NULL, 0, NULL, NULL);
+    if ($JSObjectCallAsFunction != NULL)
+        ($JSObjectCallAsFunction)(context, object, NULL, 0, NULL, NULL);
+
+    // XXX: the JavaScript code submits a form, which seems to happen asynchronously
+    NSObject *target([CyteWebViewController class]);
+    [NSObject cancelPreviousPerformRequestsWithTarget:target selector:@selector(_lockJavaScript:) object:preferences];
+    [target performSelector:@selector(_lockJavaScript:) withObject:preferences afterDelay:1];

 }
 
 - (void) reloadButtonClicked {
 }
 
 - (void) reloadButtonClicked {

-    [self reloadURLWithCache:YES];
+    [self reloadURLWithCache:NO];

 }
 
 - (void) _customButtonClicked {
 }
 
 - (void) _customButtonClicked {


@@ -978,12 +1142,54 @@ float CYScrollViewDecelerationRateNormal;
     [self setHidesNavigationBar:[value boolValue]];
 }
 
     [self setHidesNavigationBar:[value boolValue]];
 }
 

+- (void) setScrollAlwaysBounceVertical:(bool)value {
+    if ([webview_ respondsToSelector:@selector(_scrollView)]) {
+        UIScrollView *scroller([webview_ _scrollView]);
+        [scroller setAlwaysBounceVertical:value];
+    } else if ([webview_ respondsToSelector:@selector(_scroller)]) {
+        //UIScroller *scroller([webview_ _scroller]);
+        // XXX: I am sad here.
+    } else return;
+}
+
+- (void) setScrollAlwaysBounceVerticalNumber:(NSNumber *)value {
+    [self setScrollAlwaysBounceVertical:[value boolValue]];
+}
+
+- (void) setScrollIndicatorStyle:(UIScrollViewIndicatorStyle)style {
+    if ([webview_ respondsToSelector:@selector(_scrollView)]) {
+        UIScrollView *scroller([webview_ _scrollView]);
+        [scroller setIndicatorStyle:style];
+    } else if ([webview_ respondsToSelector:@selector(_scroller)]) {
+        UIScroller *scroller([webview_ _scroller]);
+        [scroller setScrollerIndicatorStyle:style];
+    } else return;
+}
+
+- (void) setScrollIndicatorStyleWithName:(NSString *)style {
+    UIScrollViewIndicatorStyle value;
+
+    if (false);
+    else if ([style isEqualToString:@"default"])
+        value = UIScrollViewIndicatorStyleDefault;
+    else if ([style isEqualToString:@"black"])
+        value = UIScrollViewIndicatorStyleBlack;
+    else if ([style isEqualToString:@"white"])
+        value = UIScrollViewIndicatorStyleWhite;
+    else return;
+
+    [self setScrollIndicatorStyle:value];
+}
+

 - (void) viewWillAppear:(BOOL)animated {
     visible_ = true;
 
     if ([self hidesNavigationBar])
         [self _setHidesNavigationBar:YES animated:animated];
 
 - (void) viewWillAppear:(BOOL)animated {
     visible_ = true;
 
     if ([self hidesNavigationBar])
         [self _setHidesNavigationBar:YES animated:animated];
 

+    // XXX: why isn't this evern called automatically?
+    [[self webView] setNeedsLayout];
+

     [self dispatchEvent:@"CydiaViewWillAppear"];
     [super viewWillAppear:animated];
 }
     [self dispatchEvent:@"CydiaViewWillAppear"];
     [super viewWillAppear:animated];
 }


@@ -1008,4 +1214,16 @@ float CYScrollViewDecelerationRateNormal;
     [self dispatchEvent:@"CydiaViewDidDisappear"];
 }
 
     [self dispatchEvent:@"CydiaViewDidDisappear"];
 }
 

+- (void) updateHeights:(NSTimer *)timer {
+    for (WebFrame *frame in (id) registered_)
+        [frame cydia$updateHeight];
+}
+
+- (void) registerFrame:(WebFrame *)frame {
+    [registered_ addObject:frame];
+
+    if (timer_ == nil)
+        timer_ = [NSTimer scheduledTimerWithTimeInterval:0.2 target:self selector:@selector(updateHeights:) userInfo:nil repeats:YES];
+}
+

 @end
 @end