Changeset 16760 in webkit

Timestamp:

Oct 3, 2006 7:31:10 PM (18 years ago)

Author:

bdash

Message:

2006-10-03 Graham Dennis <​graham.dennis@gmail.com>

Reviewed by Timothy.

<​http://bugzilla.opendarwin.org/show_bug.cgi?id=10338>
When contentEditable, cursor doesn't change to hand

Allow the behaviour of editable links to be specified by a WebPreference
The preference WebKitEditableLinkBehavior has four options:

• AlwaysLive: Safari 2.0 behaviour
• OnlyLiveWithShiftKey: Firefox/WinIE behaviour (and prior WebKit-ToT behaviour)
• LiveWhenNotFocused: Editable links are live only when their editable block is not

focused, or when the shift key is pressed

• DefaultBehavior: This is the same as OnlyLiveWithShiftKey.

No layout tests, just a modification of a manual-test as it isn't possible to test
this automatically.

• bridge/mac/WebCoreSettings.h:
• bridge/mac/WebCoreSettings.mm: (-[WebCoreSettings setEditableLinkBehavior:]): (-[WebCoreSettings editableLinkBehavior]):
• html/HTMLAnchorElement.cpp: (WebCore::HTMLAnchorElement::HTMLAnchorElement): (WebCore::HTMLAnchorElement::defaultEventHandler): (WebCore::HTMLAnchorElement::setActive):
• html/HTMLAnchorElement.h:
• manual-tests/contenteditable-link.html:
• page/FrameView.cpp: (WebCore::nodeIsNotBeingEdited): (WebCore::selectCursor):
• page/Settings.h: (WebCore::Settings::): (WebCore::Settings::Settings): (WebCore::Settings::editableLinkBehavior): (WebCore::Settings::setEditableLinkBehavior):

2006-10-03 Graham Dennis <​graham.dennis@gmail.com>

Reviewed by Timothy.

<​http://bugzilla.opendarwin.org/show_bug.cgi?id=10338>
When contentEditable, cursor doesn't change to hand

Allow the behaviour of editable links to be specified by a WebPreference
The preference WebKitEditableLinkBehavior has four options:

• AlwaysLive: Safari 2.0 behaviour
• OnlyLiveWithShiftKey: Firefox/WinIE behaviour (and prior WebKit-ToT behaviour)
• LiveWhenNotFocused: Editable links are live only when their editable block is not

focused, or when the shift key is pressed

• DefaultBehavior: This is the same as OnlyLiveWithShiftKey.

No layout tests, just a modification of a manual-test as it isn't possible to test
this automatically.

• WebView/WebPreferenceKeysPrivate.h:
• WebView/WebPreferences.m: (+[WebPreferences initialize]): (-[WebPreferences editableLinkBehavior]): (-[WebPreferences setEditableLinkBehavior:]):
• WebView/WebPreferencesPrivate.h:
• WebView/WebView.m: (-[WebView _updateWebCoreSettingsFromPreferences:]):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bridge/mac/WebCoreSettings.h (modified) (1 diff)
• WebCore/bridge/mac/WebCoreSettings.mm (modified) (2 diffs)
• WebCore/html/HTMLAnchorElement.cpp (modified) (7 diffs)
• WebCore/html/HTMLAnchorElement.h (modified) (1 diff)
• WebCore/manual-tests/contenteditable-link.html (modified) (1 diff)
• WebCore/page/FrameView.cpp (modified) (4 diffs)
• WebCore/page/Settings.h (modified) (6 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebView/WebPreferenceKeysPrivate.h (modified) (1 diff)
• WebKit/WebView/WebPreferences.m (modified) (3 diffs)
• WebKit/WebView/WebPreferencesPrivate.h (modified) (2 diffs)
• WebKit/WebView/WebView.m (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-10-03  Graham Dennis  <graham.dennis@gmail.com>
+
+        Reviewed by Timothy.
+
+        <http://bugzilla.opendarwin.org/show_bug.cgi?id=10338>
+        When contentEditable, cursor doesn't change to hand
+        
+        Allow the behaviour of editable links to be specified by a WebPreference
+        The preference WebKitEditableLinkBehavior has four options:
+         - AlwaysLive: Safari 2.0 behaviour
+         - OnlyLiveWithShiftKey: Firefox/WinIE behaviour (and prior WebKit-ToT behaviour)
+         - LiveWhenNotFocused: Editable links are live only when their editable block is not
+             focused, or when the shift key is pressed
+         - DefaultBehavior: This is the same as OnlyLiveWithShiftKey.
+         
+        No layout tests, just a modification of a manual-test as it isn't possible to test
+        this automatically.
+
+        * bridge/mac/WebCoreSettings.h:
+        * bridge/mac/WebCoreSettings.mm:
+        (-[WebCoreSettings setEditableLinkBehavior:]):
+        (-[WebCoreSettings editableLinkBehavior]):
+        * html/HTMLAnchorElement.cpp:
+        (WebCore::HTMLAnchorElement::HTMLAnchorElement):
+        (WebCore::HTMLAnchorElement::defaultEventHandler):
+        (WebCore::HTMLAnchorElement::setActive):
+        * html/HTMLAnchorElement.h:
+        * manual-tests/contenteditable-link.html:
+        * page/FrameView.cpp:
+        (WebCore::nodeIsNotBeingEdited):
+        (WebCore::selectCursor):
+        * page/Settings.h:
+        (WebCore::Settings::):
+        (WebCore::Settings::Settings):
+        (WebCore::Settings::editableLinkBehavior):
+        (WebCore::Settings::setEditableLinkBehavior):
+
 2006-10-03  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/bridge/mac/WebCoreSettings.h

@@ -119 +119 @@
 - (NSString *)defaultTextEncoding;
 
+- (void)setEditableLinkBehavior:(int)behavior;
+- (int)editableLinkBehavior;
+
 - (WebCoreSettingsImpl *)settings;
 

trunk/WebCore/bridge/mac/WebCoreSettings.mm

@@ -1 +1 @@
 /*
  * Copyright (C) 2004, 2006 Apple Computer, Inc.  All rights reserved.
+ *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * Redistribution and use in source and binary forms, with or without
@@ -335 +336 @@
 }
 
+- (void)setEditableLinkBehavior:(int)behavior
+{
+    Settings::EditableLinkBehavior b = (Settings::EditableLinkBehavior)behavior;
+    if (b != Settings::EditableLinkDefaultBehavior &&
+        b != Settings::EditableLinkAlwaysLive &&
+        b != Settings::EditableLinkOnlyLiveWithShiftKey &&
+        b != Settings::EditableLinkLiveWhenNotFocused) {
+        settings->setEditableLinkBehavior(Settings::EditableLinkDefaultBehavior);
+    } else
+        settings->setEditableLinkBehavior(b);
+}
+
+- (int)editableLinkBehavior
+{
+    return (int)settings->editableLinkBehavior();
+}
+
 - (Settings *)settings
 {

trunk/WebCore/html/HTMLAnchorElement.cpp

@@ -6 +6 @@
  *           (C) 2000 Simon Hausmann <hausmann@kde.org>
  * Copyright (C) 2003, 2006 Apple Computer, Inc.
+ *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
@@ -36 +37 @@
 #include "RenderFlow.h"
 #include "RenderImage.h"
+#include "SelectionController.h"
+#include "Settings.h"
 #include "UIEvent.h"
 #include "csshelper.h"
@@ -46 +49 @@
 HTMLAnchorElement::HTMLAnchorElement(Document* doc)
     : HTMLElement(aTag, doc)
+    , m_rootEditableElementForSelectionOnMouseDown(0)
 {
 }
@@ -51 +55 @@
 HTMLAnchorElement::HTMLAnchorElement(const QualifiedName& tagName, Document* doc)
     : HTMLElement(tagName, doc)
+    , m_rootEditableElementForSelectionOnMouseDown(0)
 {
 }
@@ -129 +134 @@
         }
 
-        if (e && !e->shiftKey() && isContentEditable()) {
-            HTMLElement::defaultEventHandler(evt);
-            return;
+        // If the link is editable, then we need to check the settings to see whether or not to follow the link
+        if (isContentEditable()) {
+            Settings::EditableLinkBehavior editableLinkBehavior = Settings::EditableLinkDefaultBehavior;
+            if (document()->frame() && document()->frame()->settings())
+                editableLinkBehavior = document()->frame()->settings()->editableLinkBehavior();
+                
+            switch(editableLinkBehavior) {
+                // Always follow the link (Safari 2.0 behavior)
+                default:
+                case Settings::EditableLinkDefaultBehavior:
+                case Settings::EditableLinkAlwaysLive:
+                    break;
+                    
+                // 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
+                case Settings::EditableLinkLiveWhenNotFocused:
+                    if (e && !e->shiftKey() && m_rootEditableElementForSelectionOnMouseDown == rootEditableElement()) {
+                        HTMLElement::defaultEventHandler(evt);
+                        return;
+                    }
+                    break;
+                
+                // Only follow the link if the shift key is down (WinIE/Firefox behavior)
+                case Settings::EditableLinkOnlyLiveWithShiftKey:
+                    if (e && !e->shiftKey()) {
+                        HTMLElement::defaultEventHandler(evt);
+                        return;
+                    }
+                    break;
+            }
         }
 
@@ -177 +209 @@
 
         evt->setDefaultHandled();
+    } else if (m_isLink && isContentEditable()) {
+    // This keeps track of the editable block that the selection was in (if it was in one) just before the link was clicked
+    // for the LiveWhenNotFocused editable link behavior
+        if (evt->type() == mousedownEvent && document()->frame() && document()->frame()->selectionController())
+            m_rootEditableElementForSelectionOnMouseDown = document()->frame()->selectionController()->rootEditableElement();
+        else if (evt->type() == mouseoutEvent)
+            m_rootEditableElementForSelectionOnMouseDown = 0;
     }
 
@@ -184 +223 @@
 void HTMLAnchorElement::setActive(bool down, bool pause)
 {
-    if (isContentEditable())
-        return;
+    if (isContentEditable()) {
+        Settings::EditableLinkBehavior editableLinkBehavior = Settings::EditableLinkDefaultBehavior;
+        if (document()->frame() && document()->frame()->settings())
+            editableLinkBehavior = document()->frame()->settings()->editableLinkBehavior();
+            
+        switch(editableLinkBehavior) {
+            default:
+            case Settings::EditableLinkDefaultBehavior:
+            case Settings::EditableLinkAlwaysLive:
+                break;
+                
+            // Don't set the link to be active if the current selection is in the same editable block as
+            // this link
+            case Settings::EditableLinkLiveWhenNotFocused:
+                if (down && document()->frame() && document()->frame()->selectionController() &&
+                    document()->frame()->selectionController()->rootEditableElement() == rootEditableElement())
+                    return;
+                break;
+            
+            case Settings::EditableLinkOnlyLiveWithShiftKey:
+                return;
+        }
+
+    }
+    
     ContainerNode::setActive(down, pause);
 }

trunk/WebCore/html/HTMLAnchorElement.h

@@ -95 +95 @@
     String search() const;
     String text() const;
+    
+private:
+    Element *m_rootEditableElementForSelectionOnMouseDown;
 };
 

trunk/WebCore/manual-tests/contenteditable-link.html

@@ -16 +16 @@
 <P>Repro movie for bug <a href="http://bugzilla.opendarwin.org/show_bug.cgi?id=7156">#7156</a></P>
 
+<div>The behaviour of editable links is controlled by the user default WebKitEditableLinkBehavior. This can be set via a private WebPreference. If the preference is OnlyLiveWithShiftKey, then the link will only be active when the shift key is pressed (WinIE/Firefox behaviour). If the preference is WebKitEditableLinkAlwaysLive or WebKitEditableLinkDefaultBehavior, then the link is always active (Safari 2.0 behaviour). Finally, if the preference is WebKitEditableLinkLiveWhenNotFocused, the link will only be live if the selection before clicking on the link is not in the same editable block as the link.</div>
+
 <div id="editable" contentEditable="true">
   <p>Test content</p>

trunk/WebCore/page/FrameView.cpp

@@ -6 +6 @@
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
+ *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
@@ -48 +49 @@
 #include "RenderView.h"
 #include "SelectionController.h"
+#include "Settings.h"
 #include "cssstyleselector.h"
 
@@ -666 +668 @@
 }
 
+// Returns true if the node's editable block is not current focused for editing
+static bool nodeIsNotBeingEdited(Node* node, Frame* frame)
+{
+    return frame->selectionController()->rootEditableElement() != node->rootEditableElement();
+}
+
 static Cursor selectCursor(const MouseEventWithHitTestResults& event, Frame* frame, bool mousePressed)
 {
@@ -704 +712 @@
         case CURSOR_AUTO: {
             bool editable = (node && node->isContentEditable());
-            if ((event.isOverLink() || isSubmitImage(node)) && (!editable || event.event().shiftKey()))
+            bool editableLinkEnabled = false;
+
+            // If the link is editable, then we need to check the settings to see whether or not the link should be followed
+            if (editable) {
+                switch(frame->settings()->editableLinkBehavior()) {
+                    default:
+                    case Settings::EditableLinkDefaultBehavior:
+                    case Settings::EditableLinkAlwaysLive:
+                        editableLinkEnabled = true;
+                        break;
+                    
+                    case Settings::EditableLinkLiveWhenNotFocused:
+                        editableLinkEnabled = nodeIsNotBeingEdited(node, frame) || event.event().shiftKey();
+                        break;
+                    
+                    case Settings::EditableLinkOnlyLiveWithShiftKey:
+                        editableLinkEnabled = event.event().shiftKey();
+                        break;
+                }
+            }
+            
+            if ((event.isOverLink() || isSubmitImage(node)) && (!editable || editableLinkEnabled))
                 return handCursor();
             RenderLayer* layer = renderer ? renderer->enclosingLayer() : 0;

trunk/WebCore/page/Settings.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
+ *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35 +36 @@
 {
 public:
+    enum EditableLinkBehavior {
+        EditableLinkDefaultBehavior = 0,
+        EditableLinkAlwaysLive,
+        EditableLinkOnlyLiveWithShiftKey,
+        EditableLinkLiveWhenNotFocused
+    };
+
     Settings()
         : m_minimumFontSize(0)
@@ -48 +56 @@
         , m_shouldPrintBackgrounds(0)
         , m_textAreasAreResizable(0)
+        , m_editableLinkBehavior(EditableLinkDefaultBehavior)
     {
     }
@@ -76 +85 @@
     bool shouldPrintBackgrounds() const { return m_shouldPrintBackgrounds; }
     bool textAreasAreResizable() const { return m_textAreasAreResizable; }
+    EditableLinkBehavior editableLinkBehavior() const { return m_editableLinkBehavior; }
 
     void setStdFontName(const AtomicString& s) { m_stdFontName = s; }
@@ -101 +111 @@
     void setShouldPrintBackgrounds(bool f) { m_shouldPrintBackgrounds = f; }
     void setTextAreasAreResizable(bool f) { m_textAreasAreResizable = f; }
+    void setEditableLinkBehavior(EditableLinkBehavior e) { m_editableLinkBehavior = e; }
     
 private:
@@ -124 +135 @@
     bool m_shouldPrintBackgrounds : 1;
     bool m_textAreasAreResizable : 1;
+    EditableLinkBehavior m_editableLinkBehavior;
 };
 

trunk/WebKit/ChangeLog

@@ +1 @@
+2006-10-03  Graham Dennis  <graham.dennis@gmail.com>
+
+        Reviewed by Timothy.
+
+        <http://bugzilla.opendarwin.org/show_bug.cgi?id=10338>
+        When contentEditable, cursor doesn't change to hand
+        
+        Allow the behaviour of editable links to be specified by a WebPreference
+        The preference WebKitEditableLinkBehavior has four options:
+         - AlwaysLive: Safari 2.0 behaviour
+         - OnlyLiveWithShiftKey: Firefox/WinIE behaviour (and prior WebKit-ToT behaviour)
+         - LiveWhenNotFocused: Editable links are live only when their editable block is not
+             focused, or when the shift key is pressed
+         - DefaultBehavior: This is the same as OnlyLiveWithShiftKey.
+         
+        No layout tests, just a modification of a manual-test as it isn't possible to test
+        this automatically.
+
+        * WebView/WebPreferenceKeysPrivate.h:
+        * WebView/WebPreferences.m:
+        (+[WebPreferences initialize]):
+        (-[WebPreferences editableLinkBehavior]):
+        (-[WebPreferences setEditableLinkBehavior:]):
+        * WebView/WebPreferencesPrivate.h:
+        * WebView/WebView.m:
+        (-[WebView _updateWebCoreSettingsFromPreferences:]):
+
 2006-10-03  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebKit/WebView/WebPreferenceKeysPrivate.h

@@ -65 +65 @@
 #define WebKitPDFDisplayModePreferenceKey @"WebKitPDFDisplayMode"
 #define WebKitPDFScaleFactorPreferenceKey @"WebKitPDFScaleFactor"
+#define WebKitEditableLinkBehaviorPreferenceKey @"WebKitEditableLinkBehavior"
 
 

trunk/WebKit/WebView/WebPreferences.m

@@ -1 +1 @@
 /*
  * Copyright (C) 2005 Apple Computer, Inc.  All rights reserved.
+ *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * Redistribution and use in source and binary forms, with or without
@@ -232 +233 @@
         @"1",                           WebKitPDFDisplayModePreferenceKey,
         @"0",                           WebKitPDFScaleFactorPreferenceKey,
+        [NSNumber numberWithInt:WebKitEditableLinkDefaultBehavior], 
+                                        WebKitEditableLinkBehaviorPreferenceKey,
         nil];
 
@@ -658 +661 @@
 }
 
+- (WebKitEditableLinkBehavior)editableLinkBehavior
+{
+    WebKitEditableLinkBehavior value = [self _integerValueForKey:WebKitEditableLinkBehaviorPreferenceKey];
+    if (value != WebKitEditableLinkDefaultBehavior &&
+        value != WebKitEditableLinkAlwaysLive &&
+        value != WebKitEditableLinkOnlyLiveWithShiftKey &&
+        value != WebKitEditableLinkLiveWhenNotFocused) {
+        // ensure that a valid result is returned
+        value = WebKitEditableLinkDefaultBehavior;
+    }
+    return value;
+}
+
+- (void)setEditableLinkBehavior:(WebKitEditableLinkBehavior)behavior
+{
+    [self _setIntegerValue:behavior forKey:WebKitEditableLinkBehaviorPreferenceKey];
+}
+
+
 static NSMutableDictionary *webPreferencesInstances = nil;
 

trunk/WebKit/WebView/WebPreferencesPrivate.h

@@ -43 +43 @@
 #endif
 
+
+typedef enum {
+    WebKitEditableLinkDefaultBehavior = 0,
+    WebKitEditableLinkAlwaysLive,
+    WebKitEditableLinkOnlyLiveWithShiftKey,
+    WebKitEditableLinkLiveWhenNotFocused
+} WebKitEditableLinkBehavior;
+
 @interface WebPreferences (WebPrivate)
 
@@ -62 +70 @@
 - (void)setPDFScaleFactor:(float)scale;
 
+- (WebKitEditableLinkBehavior)editableLinkBehavior;
+- (void)setEditableLinkBehavior:(WebKitEditableLinkBehavior)behavior;
+
 // Other private methods
 - (size_t)_pageCacheSize;

trunk/WebKit/WebView/WebView.m

@@ -877 +877 @@
     [_private->settings setShouldPrintBackgrounds:[preferences shouldPrintBackgrounds]];
     [_private->settings setTextAreasAreResizable:[preferences textAreasAreResizable]];
+    [_private->settings setEditableLinkBehavior:[preferences editableLinkBehavior]];
 }