summaryrefslogtreecommitdiff
path: root/UICaboodle
diff options
context:
space:
mode:
Diffstat (limited to 'UICaboodle')
-rw-r--r--UICaboodle/BrowserView.h1
-rw-r--r--UICaboodle/BrowserView.mm18
2 files changed, 15 insertions, 4 deletions
diff --git a/UICaboodle/BrowserView.h b/UICaboodle/BrowserView.h
index 41b3d9d..03355c2 100644
--- a/UICaboodle/BrowserView.h
+++ b/UICaboodle/BrowserView.h
@@ -93,6 +93,7 @@
bool visible_;
bool hidesNavigationBar_;
+ bool allowsNavigationAction_;
}
+ (void) _initialize;
diff --git a/UICaboodle/BrowserView.mm b/UICaboodle/BrowserView.mm
index 29fbde6..cb16f00 100644
--- a/UICaboodle/BrowserView.mm
+++ b/UICaboodle/BrowserView.mm
@@ -637,8 +637,16 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se
return true;
}
-- (bool) _allowNavigationAction {
- return true;
+- (bool) allowsNavigationAction {
+ return allowsNavigationAction_;
+}
+
+- (void) setAllowsNavigationAction:(bool)value {
+ allowsNavigationAction_ = value;
+}
+
+- (void) setAllowsNavigationActionByNumber:(NSNumber *)value {
+ [self setAllowsNavigationAction:[value boolValue]];
}
- (void) _didFailWithError:(NSError *)error forFrame:(WebFrame *)frame {
@@ -707,10 +715,12 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se
if ([frame parentFrame] == nil) {
if (!error_) {
- if ([self _allowNavigationAction])
+ NSURL *url(request == nil ? nil : [request URL]);
+
+ if (request_ == nil || [self allowsNavigationAction] || [[request_ URL] isEqual:url])
request_ = request;
else {
- if ([request URL] != nil)
+ if (url != nil)
[self pushRequest:request asPop:NO];
[listener ignore];
}