I hate subtle issues.

[cydia.git] / UICaboodle / BrowserView.m

diff --git a/UICaboodle/BrowserView.m b/UICaboodle/BrowserView.m
index d2a97c840f7eb771ffb7e608aeaabfd751a16392..0f95a049e2efe19be8d336b138a561d3b58cb9c4 100644 (file)
--- a/UICaboodle/BrowserView.m
+++ b/UICaboodle/BrowserView.m
@@ -71,7 +71,9 @@
 }
 
 + (NSString *) webScriptNameForSelector:(SEL)selector {
 }
 
 + (NSString *) webScriptNameForSelector:(SEL)selector {

-    if (selector == @selector(getPackageById:))
+    if (selector == @selector(close))
+        return @"close";
+    else if (selector == @selector(getPackageById:))

         return @"getPackageById";
     else if (selector == @selector(setAutoPopup:))
         return @"setAutoPopup";
         return @"getPackageById";
     else if (selector == @selector(setAutoPopup:))
         return @"setAutoPopup";


@@ -79,6 +81,10 @@
         return @"setButtonImage";
     else if (selector == @selector(setButtonTitle:withStyle:toFunction:))
         return @"setButtonTitle";
         return @"setButtonImage";
     else if (selector == @selector(setButtonTitle:withStyle:toFunction:))
         return @"setButtonTitle";

+    else if (selector == @selector(setPopupHook:))
+        return @"setPopupHook";
+    else if (selector == @selector(setViewportWidth:))
+        return @"setViewportWidth";

     else if (selector == @selector(supports:))
         return @"supports";
     else if (selector == @selector(du:))
     else if (selector == @selector(supports:))
         return @"supports";
     else if (selector == @selector(du:))


@@ -157,6 +163,10 @@
     return value;
 }
 
     return value;
 }
 

+- (void) close {
+    [indirect_ close];
+}
+

 - (void) setAutoPopup:(BOOL)popup {
     [indirect_ setAutoPopup:popup];
 }
 - (void) setAutoPopup:(BOOL)popup {
     [indirect_ setAutoPopup:popup];
 }


@@ -169,6 +179,14 @@
     [indirect_ setButtonTitle:button withStyle:style toFunction:function];
 }
 
     [indirect_ setButtonTitle:button withStyle:style toFunction:function];
 }
 

+- (void) setPopupHook:(id)function {
+    [indirect_ setPopupHook:function];
+}
+
+- (void) setViewportWidth:(float)width {
+    [indirect_ setViewportWidth:width];
+}
+

 @end
 /* }}} */
 
 @end
 /* }}} */
 


@@ -179,7 +197,7 @@
 #endif
 
 - (void) dealloc {
 #endif
 
 - (void) dealloc {

-#if ForSaurik
+#if LogBrowser

     NSLog(@"[BrowserView dealloc]");
 #endif
 
     NSLog(@"[BrowserView dealloc]");
 #endif
 


@@ -202,6 +220,8 @@
 
     [webview_ setDelegate:nil];
     [webview_ setGestureDelegate:nil];
 
     [webview_ setDelegate:nil];
     [webview_ setGestureDelegate:nil];

+    [webview_ setFormEditingDelegate:nil];
+    [webview_ setInteractionDelegate:nil];

 
     //NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
 
 
     //NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
 


@@ -227,6 +247,8 @@
         [style_ release];
     if (function_ != nil)
         [function_ release];
         [style_ release];
     if (function_ != nil)
         [function_ release];

+    if (closer_ != nil)
+        [closer_ release];

 
     [scroller_ release];
     [indicator_ release];
 
     [scroller_ release];
     [indicator_ release];


@@ -297,8 +319,44 @@
     return webview_;
 }
 
     return webview_;
 }
 

+- (void) _fixScroller {
+    CGRect bounds([webview_ documentBounds]);
+#if LogBrowser
+    NSLog(@"_fs:(%f,%f+%f,%f)", bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height);
+#endif
+
+    float extra;
+    if (!editing_)
+        extra = 0;
+    else {
+        UIFormAssistant *assistant([UIFormAssistant sharedFormAssistant]);
+        CGRect peripheral([assistant peripheralFrame]);
+#if LogBrowser
+        NSLog(@"per:%f", peripheral.size.height);
+#endif
+        extra = peripheral.size.height;
+    }
+
+    CGRect subrect([scroller_ frame]);
+    subrect.size.height -= extra;
+    [scroller_ setScrollerIndicatorSubrect:subrect];
+
+    NSSize visible(NSMakeSize(subrect.size.width, subrect.size.height));
+    [webview_ setValue:[NSValue valueWithSize:visible] forGestureAttribute:UIGestureAttributeVisibleSize];
+
+    CGSize size(size_);
+    size.height += extra;
+    [scroller_ setContentSize:size];
+
+    [scroller_ releaseRubberBandIfNecessary];
+}
+

 - (void) view:(UIView *)sender didSetFrame:(CGRect)frame {
 - (void) view:(UIView *)sender didSetFrame:(CGRect)frame {

-    [scroller_ setContentSize:frame.size];
+    size_ = frame.size;
+#if LogBrowser
+    NSLog(@"dsf:(%f,%f+%f,%f)", frame.origin.x, frame.origin.y, frame.size.width, frame.size.height);
+#endif
+    [self _fixScroller];

 }
 
 - (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old {
 }
 
 - (void) view:(UIView *)sender didSetFrame:(CGRect)frame oldFrame:(CGRect)old {


@@ -319,8 +377,16 @@
     [book_ pushPage:self];
 }
 
     [book_ pushPage:self];
 }
 

-- (BOOL) getSpecial:(NSURL *)url {
-#if ForSaurik
+- (void) swapPage:(RVPage *)page {
+    [page setDelegate:delegate_];
+    if (pushed_)
+        [book_ swapPage:page];
+    else
+        [book_ pushPage:page];
+}
+
+- (BOOL) getSpecial:(NSURL *)url swap:(BOOL)swap {
+#if LogBrowser

     NSLog(@"getSpecial:%@", url);
 #endif
 
     NSLog(@"getSpecial:%@", url);
 #endif
 


@@ -339,7 +405,10 @@
         return false;
 
     if (page != nil)
         return false;
 
     if (page != nil)

-        [self pushPage:page];
+        if (swap)
+            [self swapPage:page];
+        else
+            [self pushPage:page];

     return true;
 }
 
     return true;
 }
 


@@ -352,9 +421,11 @@
 }
 
 - (void) webView:(WebView *)sender runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame {
 }
 
 - (void) webView:(WebView *)sender runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WebFrame *)frame {

-    if ([self _allowJavaScriptPanel])
+    if (![self _allowJavaScriptPanel])

         return;
 
         return;
 

+    [self retain];
+

     UIActionSheet *sheet = [[[UIActionSheet alloc]
         initWithTitle:nil
         buttons:[NSArray arrayWithObjects:@"OK", nil]
     UIActionSheet *sheet = [[[UIActionSheet alloc]
         initWithTitle:nil
         buttons:[NSArray arrayWithObjects:@"OK", nil]


@@ -375,7 +446,7 @@
         initWithTitle:nil
         buttons:[NSArray arrayWithObjects:@"OK", @"Cancel", nil]
         defaultButtonIndex:0
         initWithTitle:nil
         buttons:[NSArray arrayWithObjects:@"OK", @"Cancel", nil]
         defaultButtonIndex:0

-        delegate:self
+        delegate:indirect_

         context:@"confirm"
     ] autorelease];
 
         context:@"confirm"
     ] autorelease];
 


@@ -397,6 +468,12 @@
     popup_ = popup;
 }
 
     popup_ = popup;
 }
 

+- (void) setPopupHook:(id)function {
+    if (closer_ != nil)
+        [closer_ autorelease];
+    closer_ = function == nil ? nil : [function retain];
+}
+

 - (void) setButtonImage:(NSString *)button withStyle:(NSString *)style toFunction:(id)function {
     if (button_ != nil)
         [button_ autorelease];
 - (void) setButtonImage:(NSString *)button withStyle:(NSString *)style toFunction:(id)function {
     if (button_ != nil)
         [button_ autorelease];


@@ -409,6 +486,8 @@
     if (function_ != nil)
         [function_ autorelease];
     function_ = function == nil ? nil : [function retain];
     if (function_ != nil)
         [function_ autorelease];
     function_ = function == nil ? nil : [function retain];

+
+    [self reloadButtons];

 }
 
 - (void) setButtonTitle:(NSString *)button withStyle:(NSString *)style toFunction:(id)function {
 }
 
 - (void) setButtonTitle:(NSString *)button withStyle:(NSString *)style toFunction:(id)function {


@@ -423,12 +502,31 @@
     if (function_ != nil)
         [function_ autorelease];
     function_ = function == nil ? nil : [function retain];
     if (function_ != nil)
         [function_ autorelease];
     function_ = function == nil ? nil : [function retain];

+
+    [self reloadButtons];
+}
+
+- (void) webView:(WebView *)sender willBeginEditingFormElement:(id)element {
+    editing_ = true;
+}
+
+- (void) webView:(WebView *)sender didBeginEditingFormElement:(id)element {
+    [self _fixScroller];
+}
+
+- (void) webViewDidEndEditingFormElements:(WebView *)sender {
+    editing_ = false;
+    [self _fixScroller];

 }
 
 - (void) webViewClose:(WebView *)sender {
     [book_ close];
 }
 
 }
 
 - (void) webViewClose:(WebView *)sender {
     [book_ close];
 }
 

+- (void) close {
+    [book_ close];
+}
+

 - (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
     [window setValue:cydia_ forKey:@"cydia"];
 }
 - (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
     [window setValue:cydia_ forKey:@"cydia"];
 }


@@ -438,13 +536,13 @@
 }
 
 - (void) webView:(WebView *)sender decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)name decisionListener:(id<WebPolicyDecisionListener>)listener {
 }
 
 - (void) webView:(WebView *)sender decidePolicyForNewWindowAction:(NSDictionary *)action request:(NSURLRequest *)request newFrameName:(NSString *)name decisionListener:(id<WebPolicyDecisionListener>)listener {

-#if ForSaurik
+#if LogBrowser

     NSLog(@"nwa:%@", name);
 #endif
 
     if (NSURL *url = [request URL]) {
         if (name == nil) unknown: {
     NSLog(@"nwa:%@", name);
 #endif
 
     if (NSURL *url = [request URL]) {
         if (name == nil) unknown: {

-            if (![self getSpecial:url]) {
+            if (![self getSpecial:url swap:NO]) {

                 NSString *scheme([[url scheme] lowercaseString]);
                 if ([scheme isEqualToString:@"mailto"])
                     [delegate_ openMailToURL:url];
                 NSString *scheme([[url scheme] lowercaseString]);
                 if ([scheme isEqualToString:@"mailto"])
                     [delegate_ openMailToURL:url];


@@ -454,6 +552,7 @@
             [delegate_ openURL:url];
         else if ([name isEqualToString:@"_popup"]) {
             RVBook *book([[[RVPopUpBook alloc] initWithFrame:[delegate_ popUpBounds]] autorelease]);
             [delegate_ openURL:url];
         else if ([name isEqualToString:@"_popup"]) {
             RVBook *book([[[RVPopUpBook alloc] initWithFrame:[delegate_ popUpBounds]] autorelease]);

+            [book setHook:indirect_];

 
             RVPage *page([delegate_ pageForURL:url hasTag:NULL]);
             if (page == nil) {
 
             RVPage *page([delegate_ pageForURL:url hasTag:NULL]);
             if (page == nil) {


@@ -478,13 +577,15 @@
         [listener use];
 }
 
         [listener use];
 }
 

-- (void) webView:(WebView *)webView decidePolicyForMIMEType:(NSString *)type request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {
+- (void) webView:(WebView *)sender decidePolicyForMIMEType:(NSString *)type request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id<WebPolicyDecisionListener>)listener {

     if ([WebView canShowMIMEType:type])
         [listener use];
     else {
         // XXX: handle more mime types!
         [listener ignore];
     if ([WebView canShowMIMEType:type])
         [listener use];
     else {
         // XXX: handle more mime types!
         [listener ignore];

-        if (frame == [webView mainFrame])
+
+        WebView *webview([webview_ webView]);
+        if (frame == [webview mainFrame])

             [UIApp openURL:[request URL]];
     }
 }
             [UIApp openURL:[request URL]];
     }
 }


@@ -502,17 +603,19 @@
             if (request_ != nil)
                 [request_ autorelease];
             request_ = [request retain];
             if (request_ != nil)
                 [request_ autorelease];
             request_ = [request retain];

-#if ForSaurik
+#if LogBrowser

             NSLog(@"dpn:%@", request_);
 #endif
         }
 
         [listener use];
             NSLog(@"dpn:%@", request_);
 #endif
         }
 
         [listener use];

-        /* XXX: maybe only the main frame? */
-        [self _pushPage];
+
+        WebView *webview([webview_ webView]);
+        if (frame == [webview mainFrame])
+            [self _pushPage];

         return;
     }
         return;
     }

-#if ForSaurik
+#if LogBrowser

     else NSLog(@"nav:%@:%@", url, [action description]);
 #endif
 
     else NSLog(@"nav:%@:%@", url, [action description]);
 #endif
 


@@ -529,7 +632,7 @@
 
     int store(_not(int));
     if (NSURL *itms = [url itmsURL:&store]) {
 
     int store(_not(int));
     if (NSURL *itms = [url itmsURL:&store]) {

-#if ForSaurik
+#if LogBrowser

         NSLog(@"itms#%@#%u#%@", url, store, itms);
 #endif
 
         NSLog(@"itms#%@#%u#%@", url, store, itms);
 #endif
 


@@ -554,7 +657,7 @@
         goto ignore;
     }
 
         goto ignore;
     }
 

-    if ([self getSpecial:url])
+    if ([self getSpecial:url swap:YES])

         goto ignore;
     else if ([WebView _canHandleRequest:request])
         goto use;
         goto ignore;
     else if ([WebView _canHandleRequest:request])
         goto use;


@@ -571,9 +674,10 @@
 - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
     NSString *context([sheet context]);
 
 - (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
     NSString *context([sheet context]);
 

-    if ([context isEqualToString:@"alert"])
+    if ([context isEqualToString:@"alert"]) {
+        [self autorelease];

         [sheet dismiss];
         [sheet dismiss];

-    else if ([context isEqualToString:@"confirm"]) {
+    } else if ([context isEqualToString:@"confirm"]) {

         switch (button) {
             case 1:
                 confirm_ = [NSNumber numberWithBool:YES];
         switch (button) {
             case 1:
                 confirm_ = [NSNumber numberWithBool:YES];


@@ -676,21 +780,22 @@
 
 - (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request windowFeatures:(NSDictionary *)features {
 //- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request userGesture:(BOOL)gesture {
 
 - (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request windowFeatures:(NSDictionary *)features {
 //- (WebView *) webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request userGesture:(BOOL)gesture {

-#if ForSaurik
+#if LogBrowser

     NSLog(@"cwv:%@ (%@): %@", request, title_, features == nil ? @"{}" : [features description]);
     //NSLog(@"cwv:%@ (%@): %@", request, title_, gesture ? @"Yes" : @"No");
 #endif
 
     NSNumber *value([features objectForKey:@"width"]);
     NSLog(@"cwv:%@ (%@): %@", request, title_, features == nil ? @"{}" : [features description]);
     //NSLog(@"cwv:%@ (%@): %@", request, title_, gesture ? @"Yes" : @"No");
 #endif
 
     NSNumber *value([features objectForKey:@"width"]);

-    float width(value == nil ? [BrowserView defaultWidth] : [value floatValue]);
+    float width(value == nil ? 0 : [value floatValue]);

 
     RVBook *book(!popup_ ? book_ : [[[RVPopUpBook alloc] initWithFrame:[delegate_ popUpBounds]] autorelease]);
 
     /* XXX: deal with cydia:// pages */
     BrowserView *browser([[[BrowserView alloc] initWithBook:book forWidth:width] autorelease]);
 
 
     RVBook *book(!popup_ ? book_ : [[[RVPopUpBook alloc] initWithFrame:[delegate_ popUpBounds]] autorelease]);
 
     /* XXX: deal with cydia:// pages */
     BrowserView *browser([[[BrowserView alloc] initWithBook:book forWidth:width] autorelease]);
 

-    if (features == nil && popup_) {
+    if (features != nil && popup_) {

         [book setDelegate:delegate_];
         [book setDelegate:delegate_];

+        [book setHook:indirect_];

         [browser setDelegate:delegate_];
 
         [browser loadRequest:request];
         [browser setDelegate:delegate_];
 
         [browser loadRequest:request];


@@ -726,6 +831,8 @@
     if ([frame parentFrame] != nil)
         return;
 
     if ([frame parentFrame] != nil)
         return;
 

+    [webview_ resignFirstResponder];
+

     reloading_ = false;
     loading_ = true;
     [self reloadButtons];
     reloading_ = false;
     loading_ = true;
     [self reloadButtons];


@@ -750,9 +857,15 @@
         function_ = nil;
     }
 
         function_ = nil;
     }
 

+    if (closer_ != nil) {
+        [closer_ release];
+        closer_ = nil;
+    }
+

     [book_ reloadTitleForPage:self];
 
     [scroller_ scrollPointVisibleAtTopLeft:CGPointZero];
     [book_ reloadTitleForPage:self];
 
     [scroller_ scrollPointVisibleAtTopLeft:CGPointZero];

+    [scroller_ setZoomScale:1 duration:0];

 
     CGRect webrect = [scroller_ bounds];
     webrect.size.height = 0;
 
     CGRect webrect = [scroller_ bounds];
     webrect.size.height = 0;


@@ -766,12 +879,12 @@
     }
 }
 
     }
 }
 

-- (bool) _loading {
+- (bool) isLoading {

     return loading_;
 }
 
 - (void) reloadButtons {
     return loading_;
 }
 
 - (void) reloadButtons {

-    if ([self _loading])
+    if ([self isLoading])

         [indicator_ startAnimation];
     else
         [indicator_ stopAnimation];
         [indicator_ startAnimation];
     else
         [indicator_ stopAnimation];


@@ -791,6 +904,7 @@
 }
 
 - (void) webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame {
 }
 
 - (void) webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame {

+    [self _pushPage];

     return [webview_ webView:sender didCommitLoadForFrame:frame];
 }
 
     return [webview_ webView:sender didCommitLoadForFrame:frame];
 }
 


@@ -862,15 +976,19 @@
 }
 
 - (void) webView:(WebView *)sender addMessageToConsole:(NSDictionary *)dictionary {
 }
 
 - (void) webView:(WebView *)sender addMessageToConsole:(NSDictionary *)dictionary {

-#if ForSaurik
+#if LogBrowser || ForSaurik

     lprintf("Console:%s\n", [[dictionary description] UTF8String]);
 #endif
 }
 
     lprintf("Console:%s\n", [[dictionary description] UTF8String]);
 #endif
 }
 

+- (void) setViewportWidth:(float)width {
+    width_ = width ? width != 0 : [[self class] defaultWidth];
+    [webview_ setViewportSize:CGSizeMake(width_, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x10];
+}
+

 - (id) initWithBook:(RVBook *)book forWidth:(float)width {
     if ((self = [super initWithBook:book]) != nil) {
         loading_ = false;
 - (id) initWithBook:(RVBook *)book forWidth:(float)width {
     if ((self = [super initWithBook:book]) != nil) {
         loading_ = false;

-        width_ = width;

         popup_ = false;
 
         struct CGRect bounds = [self bounds];
         popup_ = false;
 
         struct CGRect bounds = [self bounds];


@@ -950,10 +1068,13 @@
             [webview _setLayoutInterval:0];
         }
 
             [webview _setLayoutInterval:0];
         }
 

-        [webview_ setViewportSize:CGSizeMake(width_, UIWebViewGrowsAndShrinksToFitHeight) forDocumentTypes:0x10];
+        [self setViewportWidth:width];

 
         [webview_ setDelegate:self];
         [webview_ setGestureDelegate:self];
 
         [webview_ setDelegate:self];
         [webview_ setGestureDelegate:self];

+        [webview_ setFormEditingDelegate:self];
+        [webview_ setInteractionDelegate:self];
+

         [scroller_ addSubview:webview_];
 
         //NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
         [scroller_ addSubview:webview_];
 
         //NSNotificationCenter *center = [NSNotificationCenter defaultCenter];


@@ -997,49 +1118,61 @@
 }
 
 - (id) initWithBook:(RVBook *)book {
 }
 
 - (id) initWithBook:(RVBook *)book {

-    return [self initWithBook:book forWidth:[[self class] defaultWidth]];
+    return [self initWithBook:book forWidth:0];

 }
 
 - (void) didFinishGesturesInView:(UIView *)view forEvent:(id)event {
     [webview_ redrawScaledDocument];
 }
 
 }
 
 - (void) didFinishGesturesInView:(UIView *)view forEvent:(id)event {
     [webview_ redrawScaledDocument];
 }
 

-- (void) _rightButtonClicked {
-    if (function_ == nil) {
-        reloading_ = true;
-        [self reloadURL];
-    } else {
-        WebView *webview([webview_ webView]);
-        WebFrame *frame([webview mainFrame]);
-
-        id _private(MSHookIvar<id>(webview, "_private"));
-        WebCore::Page *page(_private == nil ? NULL : MSHookIvar<WebCore::Page *>(_private, "page"));
-        WebCore::Settings *settings(page == NULL ? NULL : page->settings());
-
-        bool no;
-        if (settings == NULL)
-            no = 0;
-        else {
-            no = settings->JavaScriptCanOpenWindowsAutomatically();
-            settings->setJavaScriptCanOpenWindowsAutomatically(true);
-        }
+- (void) callFunction:(WebScriptObject *)function {
+    WebView *webview([webview_ webView]);
+    WebFrame *frame([webview mainFrame]);

 
 

-        [delegate_ clearFirstResponder];
-        JSObjectRef function([function_ JSObject]);
-        JSGlobalContextRef context([frame globalContext]);
-        JSObjectCallAsFunction(context, function, NULL, 0, NULL, NULL);
+    id _private(MSHookIvar<id>(webview, "_private"));
+    WebCore::Page *page(_private == nil ? NULL : MSHookIvar<WebCore::Page *>(_private, "page"));
+    WebCore::Settings *settings(page == NULL ? NULL : page->settings());

 
 

-        if (settings != NULL)
-            settings->setJavaScriptCanOpenWindowsAutomatically(no);
+    bool no;
+    if (settings == NULL)
+        no = 0;
+    else {
+        no = settings->JavaScriptCanOpenWindowsAutomatically();
+        settings->setJavaScriptCanOpenWindowsAutomatically(true);

     }
     }

+
+    [delegate_ clearFirstResponder];
+    JSObjectRef object([function JSObject]);
+    JSGlobalContextRef context([frame globalContext]);
+    JSObjectCallAsFunction(context, object, NULL, 0, NULL, NULL);
+
+    if (settings != NULL)
+            settings->setJavaScriptCanOpenWindowsAutomatically(no);
+}
+
+- (void) didCloseBook:(RVBook *)book {
+    if (closer_ != nil)
+        [self callFunction:closer_];
+}
+
+- (void) __rightButtonClicked {
+    reloading_ = true;
+    [self reloadURL];
+}
+
+- (void) _rightButtonClicked {
+    if (function_ == nil)
+        [self __rightButtonClicked];
+    else
+        [self callFunction:function_];

 }
 
 - (id) _rightButtonTitle {
 }
 
 - (id) _rightButtonTitle {

-    return button_ != nil ? button_ : @"Reload";
+    return @"Reload";

 }
 
 - (id) rightButtonTitle {
 }
 
 - (id) rightButtonTitle {

-    return [self _loading] ? @"" : [self _rightButtonTitle];
+    return [self isLoading] ? @"" : button_ != nil ? button_ : [self _rightButtonTitle];

 }
 
 - (UINavigationButtonStyle) rightButtonStyle {
 }
 
 - (UINavigationButtonStyle) rightButtonStyle {