Reviewed by Ken.

        - fixed <rdar://problem/3809477> WebHTMLView needs to pass doCommandBySelector through delegate

        * WebView.subproj/WebHTMLView.m:
        (-[WebHTMLView doCommandBySelector:]):
        Call through to editing delegate. If editing delegate returns YES, don't call super.

        * WebView.subproj/WebDefaultEditingDelegate.m:
        (-[WebDefaultEditingDelegate webView:doCommandBySelector:]):
        default implementation (which was never called) was returning YES, but it should
        return NO to signal that it didn't handle the selector.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7617 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e1ba905bedf4da63a8359ddb0d29e4b81f7dede5..844404fd17cb4126a9a104bf136ec14908e4ffc0 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2004-09-21  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Ken.
+        
+        - fixed <rdar://problem/3809477> WebHTMLView needs to pass doCommandBySelector through delegate
+
+        * WebView.subproj/WebHTMLView.m:
+        (-[WebHTMLView doCommandBySelector:]):
+        Call through to editing delegate. If editing delegate returns YES, don't call super.
+
+        * WebView.subproj/WebDefaultEditingDelegate.m:
+        (-[WebDefaultEditingDelegate webView:doCommandBySelector:]):
+        default implementation (which was never called) was returning YES, but it should
+        return NO to signal that it didn't handle the selector.
+        
 2004-09-21  Chris Blumenberg  <cblu@apple.com>
 
        Fixed: <rdar://problem/3647229> Safari does not play inline Windows Media Content on some sites (miggy.net and ministryofsound.com)

diff --git a/WebKit/WebView.subproj/WebDefaultEditingDelegate.m b/WebKit/WebView.subproj/WebDefaultEditingDelegate.m
index f6bcd0500d79fa11e46ac7ce381f327a40fd862a..12b2ea7263b177da3629fc08bf63423ede8b84f8 100644 (file)
--- a/WebKit/WebView.subproj/WebDefaultEditingDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultEditingDelegate.m
@@ -64,7 +64,7 @@ static WebDefaultEditingDelegate *sharedDelegate = nil;
 
 - (BOOL)webView:(WebView *)webView doCommandBySelector:(SEL)selector
 {
-    return YES;
+    return NO;
 }
 
 - (void)webViewDidBeginEditing:(NSNotification *)notification

diff --git a/WebKit/WebView.subproj/WebHTMLView.m b/WebKit/WebView.subproj/WebHTMLView.m
index 48eb8013bb9a79475a9346a551462947aae93501..7d83516bf4c374120caa9d5f34222990b0fcb112 100644 (file)
--- a/WebKit/WebView.subproj/WebHTMLView.m
+++ b/WebKit/WebView.subproj/WebHTMLView.m
@@ -4045,7 +4045,9 @@ static DOMRange *unionDOMRanges(DOMRange *a, DOMRange *b)
 
 - (void)doCommandBySelector:(SEL)aSelector
 {
-    [super doCommandBySelector:aSelector];
+    if (![[webView _editingDelegateForwarder] webView:webView doCommandBySelector:aSelector]) {
+        [super doCommandBySelector:aSelector];
+    }
 }
 
 - (void)_discardMarkedText