Changeset 166241 in webkit

Timestamp:

Mar 25, 2014 12:17:54 PM (10 years ago)

Author:

andersca@apple.com

Message:

Add goBack: and goForward: IBActions and move stopLoading: to a new WKIBActions category on WKWebView
​https://bugs.webkit.org/show_bug.cgi?id=130732

Reviewed by Tim Horton.

Source/WebKit2:

• UIProcess/API/Cocoa/WKWebView.h:
• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView goBack]):
(-[WKWebView goForward]):
(-[WKWebView validateUserInterfaceItem:]):
(-[WKWebView goBack:]):
(-[WKWebView goForward:]):
(-[WKWebView stopLoading:]):

Tools:

• MiniBrowser/mac/WK2BrowserWindowController.m:

(-[WK2BrowserWindowController validateUserInterfaceItem:]):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (modified) (3 diffs)
• Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/MiniBrowser/mac/WK2BrowserWindowController.m (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-03-25  Anders Carlsson  <andersca@apple.com>
+
+        Add goBack: and goForward: IBActions and move stopLoading: to a new WKIBActions category on WKWebView
+        https://bugs.webkit.org/show_bug.cgi?id=130732
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/WKWebView.h:
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView goBack]):
+        (-[WKWebView goForward]):
+        (-[WKWebView validateUserInterfaceItem:]):
+        (-[WKWebView goBack:]):
+        (-[WKWebView goForward:]):
+        (-[WKWebView stopLoading:]):
+
 2014-03-25  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h

@@ -90 +90 @@
 - (WKNavigation *)goToBackForwardListItem:(WKBackForwardListItem *)item;
 
-- (IBAction)stopLoading:(id)sender;
-
 @property (nonatomic, readonly) NSString *title;
 
@@ -118 +116 @@
 @property (readonly) BOOL canGoForward;
 
-- (void)goBack;
-- (void)goForward;
+- (WKNavigation *)goBack;
+- (WKNavigation *)goForward;
 
 @property (nonatomic) BOOL allowsBackForwardNavigationGestures;
@@ -134 +132 @@
 @end
 
+@interface WKWebView (WKIBActions) <NSUserInterfaceValidations>
+
+- (IBAction)goBack:(id)sender;
+- (IBAction)goForward:(id)sender;
+
+- (IBAction)stopLoading:(id)sender;
+
+@end
+
 #endif

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -257 +257 @@
 }
 
-- (IBAction)stopLoading:(id)sender
-{
-    _page->stopLoading();
-}
-
 - (NSString *)title
 {
@@ -299 +294 @@
 }
 
-// FIXME: This should return a WKNavigation object.
-- (void)goBack
+- (WKNavigation *)goBack
 {
     _page->goBack();
-}
-
-// FIXME: This should return a WKNavigation object.
-- (void)goForward
+
+    // FIXME: Return a navigation object.
+    return nil;
+}
+
+- (WKNavigation *)goForward
 {
     _page->goForward();
+
+    // FIXME: Return a navigation object.
+    return nil;
 }
 
@@ -1178 +1177 @@
 @end
 
+@implementation WKWebView (WKIBActions)
+
+- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item
+{
+    SEL action = item.action;
+
+    if (action == @selector(goBack:))
+        return !!_page->backForwardList().backItem();
+
+    if (action == @selector(goForward:))
+        return !!_page->backForwardList().forwardItem();
+
+    if (action == @selector(stopLoading:)) {
+        // FIXME: Return no if we're stopped.
+        return YES;
+    }
+
+    return NO;
+}
+
+- (IBAction)goBack:(id)sender
+{
+    [self goBack];
+}
+
+- (IBAction)goForward:(id)sender
+{
+    [self goForward];
+}
+
+- (IBAction)stopLoading:(id)sender
+{
+    _page->stopLoading();
+}
+
+@end
+
 #endif // WK_API_ENABLED

trunk/Tools/ChangeLog

@@ +1 @@
+2014-03-25  Anders Carlsson  <andersca@apple.com>
+
+        Add goBack: and goForward: IBActions and move stopLoading: to a new WKIBActions category on WKWebView
+        https://bugs.webkit.org/show_bug.cgi?id=130732
+
+        Reviewed by Tim Horton.
+
+        * MiniBrowser/mac/WK2BrowserWindowController.m:
+        (-[WK2BrowserWindowController validateUserInterfaceItem:]):
+
 2014-03-25  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m

@@ -195 +195 @@
 - (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item
 {
-    SEL action = [item action];
-
-    if (action == @selector(goBack:))
-        return _webView && [_webView canGoBack];
-    
-    if (action == @selector(goForward:))
-        return _webView && [_webView canGoForward];
-    
+    SEL action = item.action;
+
+    if (action == @selector(goBack:) || action == @selector(goForward:))
+        return [_webView validateUserInterfaceItem:item];
+
     return YES;
 }