git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cc6ab86)
LayoutTests:
authoradele <adele@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Dec 2006 07:18:26 +0000 (07:18 +0000)
committeradele <adele@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Dec 2006 07:18:26 +0000 (07:18 +0000)
        Reviewed by Anders.

        Test for <rdar://problem/3824247> Select All works even if -khtml-user-select:none; style is set

        * editing/selection/select-all-user-select-none-expected.txt: Added.
        * editing/selection/select-all-user-select-none.html: Added.

WebCore:

        Reviewed by Anders.

        - Fix for <rdar://problem/3824247> Select All works even if -khtml-user-select:none; style is set

        Also made user-select:none work on new list boxes, and cleaned up the list box defaultEventHandler.

        Test: editing/selection/select-all-user-select-none.html

        * editing/SelectionController.cpp: (WebCore::SelectionController::selectAll): Make sure canSelect is true on the root renderer.
        * html/HTMLSelectElement.cpp:
        (WebCore::HTMLSelectElement::canSelectAll): Check canSelect here.
        (WebCore::HTMLSelectElement::selectAll): Added nil check for renderer.
        (WebCore::HTMLSelectElement::defaultEventHandler): Return early if the event has been handled.
        (WebCore::HTMLSelectElement::listBoxDefaultEventHandler): Check canSelect here.
        * html/HTMLSelectElement.h:

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

LayoutTests/ChangeLog patch | blob | history
LayoutTests/editing/selection/select-all-user-select-none-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/editing/selection/select-all-user-select-none.html [new file with mode: 0644] patch | blob
WebCore/ChangeLog patch | blob | history
WebCore/editing/SelectionController.cpp patch | blob | history
WebCore/html/HTMLSelectElement.cpp patch | blob | history
WebCore/html/HTMLSelectElement.h patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e3eb205c414d8acdb17e0b7877311f14f67db00c..06f5dbdc64444eec644ae2f361e5da090ac00889 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2006-12-19  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Anders.
+
+        Test for <rdar://problem/3824247> Select All works even if -khtml-user-select:none; style is set
+
+        * editing/selection/select-all-user-select-none-expected.txt: Added.
+        * editing/selection/select-all-user-select-none.html: Added.
+
 2006-12-19  Anders Carlsson  <acarlsson@apple.com>
 
         Reviewed by Adele.
diff --git a/LayoutTests/editing/selection/select-all-user-select-none-expected.txt b/LayoutTests/editing/selection/select-all-user-select-none-expected.txt
new file mode 100644 (file)
index 0000000..40531aa
--- /dev/null
+++ b/LayoutTests/editing/selection/select-all-user-select-none-expected.txt
@@ -0,0 +1 @@
+Test Passed
diff --git a/LayoutTests/editing/selection/select-all-user-select-none.html b/LayoutTests/editing/selection/select-all-user-select-none.html
new file mode 100644 (file)
index 0000000..c05c518
--- /dev/null
+++ b/LayoutTests/editing/selection/select-all-user-select-none.html
@@ -0,0 +1,21 @@
+<html>
+    <head>
+        <style>
+        html {
+            -webkit-user-select: none;
+        }
+        </style>
+        <script>
+            function test() {
+                if (window.layoutTestController)
+                    layoutTestController.dumpAsText();
+                document.execCommand('SelectAll');
+                if (window.getSelection().toString() == "")
+                    document.body.innerHTML = "Test Passed";
+            }
+        </script>
+    </head>
+    <body onload="test()">
+    Test Failed (this should not be selected)
+    </body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bfdfcbdd0eff6e0b337baeb163b934f68157117d..78744bd0aec2cd01e0ea344c08accfd21b84c9bd 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2006-12-19  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Anders.
+
+        - Fix for <rdar://problem/3824247> Select All works even if -khtml-user-select:none; style is set
+
+        Also made user-select:none work on new list boxes, and cleaned up the list box defaultEventHandler.
+
+        Test: editing/selection/select-all-user-select-none.html
+
+        * editing/SelectionController.cpp: (WebCore::SelectionController::selectAll): Make sure canSelect is true on the root renderer.
+        * html/HTMLSelectElement.cpp:
+        (WebCore::HTMLSelectElement::canSelectAll): Check canSelect here.
+        (WebCore::HTMLSelectElement::selectAll): Added nil check for renderer.
+        (WebCore::HTMLSelectElement::defaultEventHandler): Return early if the event has been handled.
+        (WebCore::HTMLSelectElement::listBoxDefaultEventHandler): Check canSelect here.
+        * html/HTMLSelectElement.h:
+
 2006-12-19  Anders Carlsson  <acarlsson@apple.com>
 
         Reviewed by Adele.
diff --git a/WebCore/editing/SelectionController.cpp b/WebCore/editing/SelectionController.cpp
index 877b3af257a0b282575ddd9afe59ba3d77b3f09f..1c1b54b381569014a5f17b49265627c6e49b3628 100644 (file)
--- a/WebCore/editing/SelectionController.cpp
+++ b/WebCore/editing/SelectionController.cpp
@@ -1091,6 +1091,8 @@ void SelectionController::selectAll()
     }
     
     Node* root = isContentEditable() ? highestEditableRoot(m_sel.start()) : document->documentElement();
+    if (!root->renderer() || !root->renderer()->canSelect())
+        return;
     Selection newSelection(Selection::selectionFromContentsOfNode(root));
     if (m_frame->shouldChangeSelection(newSelection))
         setSelection(newSelection);
diff --git a/WebCore/html/HTMLSelectElement.cpp b/WebCore/html/HTMLSelectElement.cpp
index 8414c99e49ef2a95eb2baaa5771d66df60b9dcd9..7bbb189a10e27af9f0ddbed86b036b2d30226c9d 100644 (file)
--- a/WebCore/html/HTMLSelectElement.cpp
+++ b/WebCore/html/HTMLSelectElement.cpp
@@ -355,10 +355,15 @@ bool HTMLSelectElement::isMouseFocusable() const
     return HTMLGenericFormElement::isMouseFocusable();
 }
 
+bool HTMLSelectElement::canSelectAll() const
+{
+    return !usesMenuList() && renderer() && renderer()->canSelect(); 
+}
+
 void HTMLSelectElement::selectAll()
 {
     ASSERT(!usesMenuList());
-    if (!multiple())
+    if (!renderer() || !multiple())
         return;
     
     m_activeSelectionState = true;
@@ -551,6 +556,9 @@ void HTMLSelectElement::defaultEventHandler(Event* evt)
         menuListDefaultEventHandler(evt);
     else 
         listBoxDefaultEventHandler(evt);
+    
+    if (evt->defaultHandled())
+        return;
 
     if (!evt->defaultHandled() && evt->type() == keypressEvent && evt->isKeyboardEvent()) {
         KeyboardEvent* keyboardEvent = static_cast<KeyboardEvent*>(evt);
@@ -559,6 +567,7 @@ void HTMLSelectElement::defaultEventHandler(Event* evt)
             && isprint(static_cast<KeyboardEvent*>(evt)->charCode())) {
             typeAheadFind(static_cast<KeyboardEvent*>(evt));
             evt->setDefaultHandled();
+            return;
         }
     }
 
@@ -629,7 +638,7 @@ void HTMLSelectElement::menuListDefaultEventHandler(Event* evt)
 
 void HTMLSelectElement::listBoxDefaultEventHandler(Event* evt)
 {
-    if (!renderer())
+    if (!renderer() || !renderer()->canSelect())
         return;
 
     if (evt->type() == mousedownEvent) {
@@ -682,6 +691,7 @@ void HTMLSelectElement::listBoxDefaultEventHandler(Event* evt)
             setActiveSelectionEndIndex(listIndex);
             updateListBoxSelection(!multiSelect);
             renderer()->repaint();
+            evt->setDefaultHandled();
         }
     } else if (evt->type() == mouseupEvent && document()->frame()->eventHandler()->autoscrollRenderer() != renderer())
         // This makes sure we fire onChange for a single click.  For drag selection, onChange will fire when the autoscroll timer stops.
@@ -720,11 +730,10 @@ void HTMLSelectElement::listBoxDefaultEventHandler(Event* evt)
             }
 
             static_cast<RenderListBox*>(renderer())->scrollToRevealElementAtListIndex(endIndex);
-            evt->setDefaultHandled();
             updateListBoxSelection(deselectOthers);
-            renderer()->repaint();
-            
+            renderer()->repaint();            
             listBoxOnChange();
+            evt->setDefaultHandled();
         }
     }
 }
diff --git a/WebCore/html/HTMLSelectElement.h b/WebCore/html/HTMLSelectElement.h
index e8aeb46277111b6649d81c6023adec78101fbb66..f31512dd7fbba1dc3d04f6be9acc6a9d08d9cf7e 100644 (file)
--- a/WebCore/html/HTMLSelectElement.h
+++ b/WebCore/html/HTMLSelectElement.h
@@ -51,7 +51,7 @@ public:
     
     virtual bool isKeyboardFocusable(KeyboardEvent*) const;
     virtual bool isMouseFocusable() const;
-    virtual bool canSelectAll() const { return !usesMenuList(); }
+    virtual bool canSelectAll() const;
     virtual void selectAll();
 
     virtual void recalcStyle(StyleChange);
Mirror of the WebKit open source project from svn.webkit.org.