Changeset 14346 in webkit

Timestamp:

May 12, 2006 7:44:53 PM (18 years ago)

Author:

thatcher

Message:

Reviewed by Darin.

​http://bugzilla.opendarwin.org/show_bug.cgi?id=7156
Bug 7156: TinyMCE: Links are actually activated in editable area, not editable.

Links in editable areas will not activate or perform a navigation
change (on par with WinIE and Firefox.) To visit the link
you can shift-click. Manual test added.

• css/cssstyleselector.cpp: (WebCore::CSSStyleSelector::adjustRenderStyle):
• html/HTMLAnchorElement.cpp: (WebCore::HTMLAnchorElement::defaultEventHandler): (WebCore::HTMLAnchorElement::setActive):
• html/HTMLAnchorElement.h:
• manual-tests/contenteditable-link.html: Added.
• page/FrameView.cpp: (WebCore::selectCursor):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (2 diffs)
• css/cssstyleselector.cpp (modified) (1 diff)
• html/HTMLAnchorElement.cpp (modified) (5 diffs)
• html/HTMLAnchorElement.h (modified) (1 diff)
• manual-tests/contenteditable-link.html (added)
• page/FrameView.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-05-12  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin.
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=7156
+        Bug 7156: TinyMCE: Links are actually activated in editable area, not editable.
+        
+        Links in editable areas will not activate or perform a navigation
+        change (on par with WinIE and Firefox.) To visit the link
+        you can shift-click. Manual test added.
+
+        * css/cssstyleselector.cpp:
+        (WebCore::CSSStyleSelector::adjustRenderStyle):
+        * html/HTMLAnchorElement.cpp:
+        (WebCore::HTMLAnchorElement::defaultEventHandler):
+        (WebCore::HTMLAnchorElement::setActive):
+        * html/HTMLAnchorElement.h:
+        * manual-tests/contenteditable-link.html: Added.
+        * page/FrameView.cpp:
+        (WebCore::selectCursor):
+
 2006-05-12  Eric Seidel  <eseidel@apple.com>
 
@@ -1089 +1110 @@
         * WebCore: Removed an extra WebCore subtree that somehow got checked in.
 
->>>>>>> .r14297
 2006-05-10  David Carson <dacarson@gmail.com>
 

trunk/WebCore/css/cssstyleselector.cpp

@@ -999 +999 @@
          style->display() == TABLE_ROW_GROUP || style->display() == TABLE_ROW))
         style->setOverflow(OVISIBLE);
+
+    // Links should be user selectable when content editable
+    if (e && e->isLink() && (style->userModify() == READ_WRITE || style->userModify() == READ_WRITE_PLAINTEXT_ONLY))
+        style->setUserSelect(SELECT_AUTO);
 
     // Cull out any useless layers and also repeat patterns into additional layers.

trunk/WebCore/html/HTMLAnchorElement.cpp

@@ -105 +105 @@
     // Don't make this KEYUP_EVENT again, it makes khtml follow links it shouldn't,
     // when pressing Enter in the combo.
-    if ((evt->type() == clickEvent || (evt->type() == keydownEvent && m_focused)) && m_isLink) {
+    if (m_isLink && (evt->type() == clickEvent || (evt->type() == keydownEvent && m_focused))) {
         MouseEvent* e = 0;
         if (evt->type() == clickEvent)
@@ -114 +114 @@
             k = static_cast<KeyboardEvent*>(evt);
 
-        DeprecatedString utarget;
-        DeprecatedString url;
-
         if (e && e->button() == 2) {
+            HTMLElement::defaultEventHandler(evt);
+            return;
+        }
+
+        if (e && !e->shiftKey() && isContentEditable()) {
             HTMLElement::defaultEventHandler(evt);
             return;
@@ -134 +136 @@
         }
 
-        url = parseURL(getAttribute(hrefAttr)).deprecatedString();
-
-        utarget = getAttribute(targetAttr).deprecatedString();
+        DeprecatedString url = WebCore::parseURL(getAttribute(hrefAttr)).deprecatedString();
+        String utarget = getAttribute(targetAttr);
 
         if (e && e->button() == 1)
@@ -144 +145 @@
             HTMLImageElement* img = static_cast<HTMLImageElement*>(evt->target());
             if (img && img->isServerMap()) {
-                RenderImage *r = static_cast<RenderImage*>(img->renderer());
+                RenderImage* r = static_cast<RenderImage*>(img->renderer());
                 if(r && e) {
                     int absx, absy;
@@ -160 +161 @@
             }
         }
-        if (!evt->defaultPrevented()) {
-            if (document()->frame())
-                document()->frame()->urlSelected(url, utarget);
-        }
+
+        if (!evt->defaultPrevented() && document()->frame())
+            document()->frame()->urlSelected(url, utarget);
+
         evt->setDefaultHandled();
     }
+
     HTMLElement::defaultEventHandler(evt);
 }
 
+void HTMLAnchorElement::setActive(bool down, bool pause)
+{
+    if (isContentEditable())
+        return;
+    ContainerNode::setActive(down, pause);
+}
 
 void HTMLAnchorElement::parseMappedAttribute(MappedAttribute *attr)

trunk/WebCore/html/HTMLAnchorElement.h

@@ -46 +46 @@
     virtual void parseMappedAttribute(MappedAttribute*);
     virtual void defaultEventHandler(Event*);
+    virtual void setActive(bool active = true, bool pause = false);
     virtual void accessKeyAction(bool fullAction);
     virtual bool isURLAttribute(Attribute*) const;

trunk/WebCore/page/FrameView.cpp

@@ -555 +555 @@
 
     switch (style ? style->cursor() : CURSOR_AUTO) {
-        case CURSOR_AUTO:
-            if (event.isOverLink() || isSubmitImage(node))
+        case CURSOR_AUTO: {
+            bool editable = (node && node->isContentEditable());
+            if ((event.isOverLink() || isSubmitImage(node)) && (!editable || event.event().shiftKey()))
                 return handCursor();
-            if ((node && node->isContentEditable()) || (renderer && renderer->isText() && renderer->canSelect()))
+            if (editable || (renderer && renderer->isText() && renderer->canSelect()))
                 return iBeamCursor();
             return pointerCursor();
+        }
         case CURSOR_CROSS:
             return crossCursor();