WebCore:

        Reviewed by John.

        Adding isContentEditable to DOMNode's private category.

        * bindings/objc/DOMPrivate.h:

WebKit:

        Reviewed by John.

        The context menu code should be checking isContentEditable
        on DOMNode not just DOMElement. This is needed because DOMText
        will be the node class of any text that is clicked.

        * DefaultDelegates/WebDefaultContextMenuDelegate.m:
        (-[WebDefaultUIDelegate webView:contextMenuItemsForElement:defaultMenuItems:]):

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ef56c7c99043dbe0045d59e56e5f7b931d1fdc36..17fe8c0bbd4f6669cc0e0328cd9c309a3b251c5d 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-28  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by John.
+
+        Adding isContentEditable to DOMNode's private category. 
+
+        * bindings/objc/DOMPrivate.h:
+
 2006-07-28  Alexey Proskuryakov  <ap@nypop.com>
 
         Rolling out http://bugzilla.opendarwin.org/show_bug.cgi?id=6010 because of failing layout tests.

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index b95c7b5288f7d662f1330272e32ed044ced7f8c1..f7a48b0bd3b004961fb755261fc0f0cd27d9726d 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -1598,23 +1598,6 @@
                FAE04190097596C9000540BE /* SVGImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = FAE0418E097596C9000540BE /* SVGImageLoader.h */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXBuildStyle section */
-               BCF4E5090A7566950090527A /* Development */ = {
-                       isa = PBXBuildStyle;
-                       buildSettings = {
-                               COPY_PHASE_STRIP = NO;
-                       };
-                       name = Development;
-               };
-               BCF4E50A0A7566950090527A /* Deployment */ = {
-                       isa = PBXBuildStyle;
-                       buildSettings = {
-                               COPY_PHASE_STRIP = YES;
-                       };
-                       name = Deployment;
-               };
-/* End PBXBuildStyle section */
-
 /* Begin PBXContainerItemProxy section */
                DD041FF009D9E3250010AF2A /* PBXContainerItemProxy */ = {
                        isa = PBXContainerItemProxy;
@@ -6452,12 +6435,6 @@
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
-                       buildSettings = {
-                       };
-                       buildStyles = (
-                               BCF4E5090A7566950090527A /* Development */,
-                               BCF4E50A0A7566950090527A /* Deployment */,
-                       );
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,

diff --git a/WebCore/bindings/objc/DOMPrivate.h b/WebCore/bindings/objc/DOMPrivate.h
index 4e5d3d60a4cbf7dea9c0d7877fc5db4b975061da..ca15a91dd05bb63d84ef2206b8426da3347a714e 100644 (file)
--- a/WebCore/bindings/objc/DOMPrivate.h
+++ b/WebCore/bindings/objc/DOMPrivate.h
@@ -38,6 +38,10 @@
 - (NSColor *)_color;
 @end
 
+@interface DOMNode (WebPrivate)
+- (BOOL)isContentEditable;
+@end
+
 @interface DOMElement (WebPrivate)
 - (NSFont *)_font;
 - (NSData *)_imageTIFFRepresentation;

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 75d9194c2e7d87a60b782aa306a4b5ae0a900c6b..d36d227d50e57364858ca1ec4257bc045a19454f 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2006-07-28  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by John.
+
+        The context menu code should be checking isContentEditable
+        on DOMNode not just DOMElement. This is needed because DOMText
+        will be the node class of any text that is clicked.
+
+        * DefaultDelegates/WebDefaultContextMenuDelegate.m:
+        (-[WebDefaultUIDelegate webView:contextMenuItemsForElement:defaultMenuItems:]):
+
 2006-07-25  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Maciej, inspired by John.

diff --git a/WebKit/DefaultDelegates/WebDefaultContextMenuDelegate.m b/WebKit/DefaultDelegates/WebDefaultContextMenuDelegate.m
index 453b59f881b55275fa3d990caf1a92eecb9e0595..93ef90cb82ea7732c7818e48aecadb1e1562f7a4 100644 (file)
--- a/WebKit/DefaultDelegates/WebDefaultContextMenuDelegate.m
+++ b/WebKit/DefaultDelegates/WebDefaultContextMenuDelegate.m
@@ -351,8 +351,8 @@ static NSString *localizedMenuTitleFromAppKit(NSString *key, NSString *comment)
         contentEditible = YES;
     else if ([domElement isKindOfClass:[DOMHTMLInputElement class]])
         contentEditible = [(DOMHTMLInputElement *)domElement _isTextField];
-    else if ([domElement isKindOfClass:[DOMHTMLElement class]])
-        contentEditible = [(DOMHTMLElement *)domElement isContentEditable];
+    else if ([domElement isKindOfClass:[DOMNode class]])
+        contentEditible = [(DOMNode *)domElement isContentEditable];
 
     NSView *documentView = [[[element objectForKey:WebElementFrameKey] frameView] documentView];
     if ([documentView isKindOfClass:[WebHTMLView class]] && contentEditible) {