Changeset 17776 in webkit

Timestamp:

Nov 14, 2006 9:42:44 PM (17 years ago)

Author:

thatcher

Message:

WebCore:

Reviewed by Harrison.

<rdar://problem/4766635> Safari should never follow links in editable areas (add a WebKitEditableLinkNeverLive option)

Adds an EditableLinkNeverLive setting that will make links in editable areas always dead.

• bridge/mac/WebCoreSettings.mm: (-[WebCoreSettings setEditableLinkBehavior:]):
• html/HTMLAnchorElement.cpp: (WebCore::HTMLAnchorElement::defaultEventHandler): (WebCore::HTMLAnchorElement::setActive): (WebCore::HTMLAnchorElement::isLiveLink):
• page/FrameView.cpp: (WebCore::selectCursor):
• page/Settings.h: (WebCore::Settings::):

WebKit:

Reviewed by Harrison.

<rdar://problem/4766635> Safari should never follow links in editable areas (add a WebKitEditableLinkNeverLive option)

Adds an Open Link, Open Link in New Window and Copy Link to the editing context menu.
Adds a new WebKitEditableLinkNeverLive preference value that maps to WebCore's EditableLinkNeverLive.

• DefaultDelegates/WebDefaultContextMenuDelegate.m: (-[WebDefaultUIDelegate menuItemWithTag:target:representedObject:]): (-[WebDefaultUIDelegate contextMenuItemsForElement:defaultMenuItems:]): (-[WebDefaultUIDelegate editingContextMenuItemsForElement:defaultMenuItems:]): (-[WebDefaultUIDelegate requestWithURL:includingReferrerFromFrame:]): (-[WebDefaultUIDelegate openNewWindowWithURL:element:]): (-[WebDefaultUIDelegate openLink:]):
• English.lproj/Localizable.strings:
• WebKit.exp:
• WebView/WebPreferences.m: (-[WebPreferences editableLinkBehavior]):
• WebView/WebPreferencesPrivate.h:
• WebView/WebUIDelegatePrivate.h:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• WebCore/bridge/mac/WebCoreSettings.mm (modified) (1 diff)
• WebCore/html/HTMLAnchorElement.cpp (modified) (4 diffs)
• WebCore/page/EventHandler.cpp (modified) (1 diff)
• WebCore/page/Settings.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/DefaultDelegates/WebDefaultContextMenuDelegate.m (modified) (6 diffs)
• WebKit/English.lproj/Localizable.strings (modified) (1 diff)
• WebKit/WebKit.exp (modified) (1 diff)
• WebKit/WebView/WebPreferences.m (modified) (1 diff)
• WebKit/WebView/WebPreferencesPrivate.h (modified) (1 diff)
• WebKit/WebView/WebUIDelegatePrivate.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-11-14  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Harrison.
+
+        <rdar://problem/4766635> Safari should never follow links in editable areas (add a WebKitEditableLinkNeverLive option)
+
+        Adds an EditableLinkNeverLive setting that will make links in editable areas always dead.
+
+        * bridge/mac/WebCoreSettings.mm:
+        (-[WebCoreSettings setEditableLinkBehavior:]):
+        * html/HTMLAnchorElement.cpp:
+        (WebCore::HTMLAnchorElement::defaultEventHandler):
+        (WebCore::HTMLAnchorElement::setActive):
+        (WebCore::HTMLAnchorElement::isLiveLink):
+        * page/FrameView.cpp:
+        (WebCore::selectCursor):
+        * page/Settings.h:
+        (WebCore::Settings::):
+
 2006-11-14  Mark Rowe  <bdash@webkit.org>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -10593 +10593 @@
                         isa = PBXProject;
                         buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
+                        compatibilityVersion = "Xcode 2.4";
                         hasScannedForEncodings = 1;
                         knownRegions = (
@@ -10607 +10608 @@
                         projectDirPath = "";
                         projectRoot = "";
+                        shouldCheckCompatibility = 1;
                         targets = (
                                 93F198A508245E59001E9ABC /* WebCore */,

trunk/WebCore/bridge/mac/WebCoreSettings.mm

@@ -339 +339 @@
     if (b != Settings::EditableLinkDefaultBehavior &&
         b != Settings::EditableLinkAlwaysLive &&
+        b != Settings::EditableLinkNeverLive &&
         b != Settings::EditableLinkOnlyLiveWithShiftKey &&
         b != Settings::EditableLinkLiveWhenNotFocused) {

trunk/WebCore/html/HTMLAnchorElement.cpp

@@ -152 +152 @@
                 case Settings::EditableLinkAlwaysLive:
                     break;
-                    
+
+                case Settings::EditableLinkNeverLive:
+                    HTMLElement::defaultEventHandler(evt);
+                    return;
+
                 // If the selection prior to clicking on this link resided in the same editable block as this link,
                 // and the shift key isn't pressed, we don't want to follow the link
@@ -161 +165 @@
                     }
                     break;
-                
+
                 // Only follow the link if the shift key is down (WinIE/Firefox behavior)
                 case Settings::EditableLinkOnlyLiveWithShiftKey:
@@ -246 +250 @@
             case Settings::EditableLinkAlwaysLive:
                 break;
-                
+
+            case Settings::EditableLinkNeverLive:
+                return;
+
             // Don't set the link to be active if the current selection is in the same editable block as
             // this link
@@ -475 +482 @@
         case Settings::EditableLinkAlwaysLive:
             return true;
-            
+
+        case Settings::EditableLinkNeverLive:
+            return false;
+
         // Don't set the link to be live if the current selection is in the same editable block as
         // this link or if the shift key is down

trunk/WebCore/page/EventHandler.cpp

@@ -558 +558 @@
                         editableLinkEnabled = true;
                         break;
-                    
+
+                    case Settings::EditableLinkNeverLive:
+                        editableLinkEnabled = false;
+                        break;
+
                     case Settings::EditableLinkLiveWhenNotFocused:
                         editableLinkEnabled = nodeIsNotBeingEdited(node, frame) || event.event().shiftKey();

trunk/WebCore/page/Settings.h

@@ -40 +40 @@
         EditableLinkAlwaysLive,
         EditableLinkOnlyLiveWithShiftKey,
-        EditableLinkLiveWhenNotFocused
+        EditableLinkLiveWhenNotFocused,
+        EditableLinkNeverLive
     };
 

trunk/WebKit/ChangeLog

@@ +1 @@
+2006-11-14  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Harrison.
+
+        <rdar://problem/4766635> Safari should never follow links in editable areas (add a WebKitEditableLinkNeverLive option)
+
+        Adds an Open Link, Open Link in New Window and Copy Link to the editing context menu.
+        Adds a new WebKitEditableLinkNeverLive preference value that maps to WebCore's EditableLinkNeverLive.
+
+        * DefaultDelegates/WebDefaultContextMenuDelegate.m:
+        (-[WebDefaultUIDelegate menuItemWithTag:target:representedObject:]):
+        (-[WebDefaultUIDelegate contextMenuItemsForElement:defaultMenuItems:]):
+        (-[WebDefaultUIDelegate editingContextMenuItemsForElement:defaultMenuItems:]):
+        (-[WebDefaultUIDelegate requestWithURL:includingReferrerFromFrame:]):
+        (-[WebDefaultUIDelegate openNewWindowWithURL:element:]):
+        (-[WebDefaultUIDelegate openLink:]):
+        * English.lproj/Localizable.strings:
+        * WebKit.exp:
+        * WebView/WebPreferences.m:
+        (-[WebPreferences editableLinkBehavior]):
+        * WebView/WebPreferencesPrivate.h:
+        * WebView/WebUIDelegatePrivate.h:
+
 2006-11-14  Anders Carlsson  <acarlsson@apple.com>
 

trunk/WebKit/DefaultDelegates/WebDefaultContextMenuDelegate.m

@@ -78 +78 @@
     
     switch(tag) {
+        case WebMenuItemTagOpenLink:
+            title = UI_STRING("Open Link", "Open Link context menu item");
+            action = @selector(openLink:);
+            break;
         case WebMenuItemTagOpenLinkInNewWindow:
             title = UI_STRING("Open Link in New Window", "Open in New Window context menu item");
@@ -207 +211 @@
         [menuItems addObject:[self menuItemWithTag:WebMenuItemTagCopyLinkToClipboard target:self representedObject:element]];
     }
-    
+
     WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
     NSURL *imageURL = [element objectForKey:WebElementImageURLKey];
@@ -294 +298 @@
     }
 
+    NSURL *linkURL = [element objectForKey:WebElementLinkURLKey];
+    
     if ([[element objectForKey:WebElementIsSelectedKey] boolValue] && !inPasswordField) {
         [menuItems addObject:[self menuItemWithTag:WebMenuItemTagSearchInSpotlight target:nil representedObject:element]];
@@ -306 +312 @@
         [menuItems addObject:[NSMenuItem separatorItem]];
     }
-    
+
+    if (linkURL) {
+        if([WebView _canHandleRequest:[NSURLRequest requestWithURL:linkURL]]) {
+            [menuItems addObject:[self menuItemWithTag:WebMenuItemTagOpenLink target:self representedObject:element]];
+            [menuItems addObject:[self menuItemWithTag:WebMenuItemTagOpenLinkInNewWindow target:self representedObject:element]];
+        }
+        [menuItems addObject:[self menuItemWithTag:WebMenuItemTagCopyLinkToClipboard target:self representedObject:element]];
+        // FIXME: we should add "Edit Link..." here like NSTextView has in it's context menu
+        [menuItems addObject:[NSMenuItem separatorItem]];
+    }
+
     // Load our NSTextView-like context menu nib.
     if (defaultMenu == nil) {
@@ -370 +386 @@
 }
 
-- (void)openNewWindowWithURL:(NSURL *)URL element:(NSDictionary *)element
-{
-    WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
-    WebView *webView = [webFrame webView];
-    
+- (NSURLRequest *)requestWithURL:(NSURL *)URL includingReferrerFromFrame:(WebFrame *)webFrame
+{
     NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL];
     NSString *referrer = core(webFrame)->loader()->outgoingReferrer();
     if (referrer)
         [request _web_setHTTPReferrer:referrer];
-    
-    [webView _openNewWindowWithRequest:request];
+    return request;
+}
+
+- (void)openNewWindowWithURL:(NSURL *)URL element:(NSDictionary *)element
+{
+    WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
+    WebView *webView = [webFrame webView];
+    [webView _openNewWindowWithRequest:[self requestWithURL:URL includingReferrerFromFrame:webFrame]];
 }
 
@@ -388 +407 @@
     WebView *webView = [webFrame webView];
     [webView _downloadURL:URL];
+}
+
+- (void)openLink:(id)sender
+{
+    NSDictionary *element = [sender representedObject];
+    WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
+    WebFrame *targetFrame = [element objectForKey:WebElementLinkTargetFrameKey];
+    NSURL *url = [element objectForKey:WebElementLinkURLKey];
+    if (targetFrame)
+        [targetFrame loadRequest:[self requestWithURL:url includingReferrerFromFrame:webFrame]];
+    else
+        [self openNewWindowWithURL:url element:element];
 }
 

trunk/WebKit/English.lproj/Localizable.strings

@@ -131 +131 @@
 "Open Image in New Window" = "Open Image in New Window";
 
+/* Open Link context menu item */
+"Open Link" = "Open Link";
+
 /* Open in New Window context menu item */
 "Open Link in New Window" = "Open Link in New Window";

trunk/WebKit/WebKit.exp

@@ -42 +42 @@
 _WebElementImageURLKey
 _WebElementIsSelectedKey
+_WebElementLinkIsLiveKey
 _WebElementLinkLabelKey
 _WebElementLinkTargetFrameKey

trunk/WebKit/WebView/WebPreferences.m

@@ -677 +677 @@
     if (value != WebKitEditableLinkDefaultBehavior &&
         value != WebKitEditableLinkAlwaysLive &&
+        value != WebKitEditableLinkNeverLive &&
         value != WebKitEditableLinkOnlyLiveWithShiftKey &&
         value != WebKitEditableLinkLiveWhenNotFocused) {

trunk/WebKit/WebView/WebPreferencesPrivate.h

@@ -43 +43 @@
 #endif
 
-
+// WebKitEditableLinkBehavior needs to match the Settings::EditableLinkBehavior enum in WebCore
 typedef enum {
     WebKitEditableLinkDefaultBehavior = 0,
     WebKitEditableLinkAlwaysLive,
     WebKitEditableLinkOnlyLiveWithShiftKey,
-    WebKitEditableLinkLiveWhenNotFocused
+    WebKitEditableLinkLiveWhenNotFocused,
+    WebKitEditableLinkNeverLive
 } WebKitEditableLinkBehavior;
 

trunk/WebKit/WebView/WebUIDelegatePrivate.h

@@ -29 +29 @@
 #import <WebKit/WebUIDelegate.h>
 
+// FIXME: This should move to WebUIDelegate.h as part of the WebMenuItemTag enum there, when we're not in API freeze 
+enum { 
+    WebMenuItemTagOpenLink = 1000
+};
+
 @interface NSObject (WebUIDelegatePrivate)