Reviewed by Adele.

        Improve popup menu behavior.

        * html/HTMLSelectElement.cpp:
        (WebCore::HTMLSelectElement::HTMLSelectElement): Cache
        m_lastOnChangeIndex so we know when to fire onChange.
        (WebCore::HTMLSelectElement::setSelectedIndex): Added parameter to
        specify whether we should fire onChange.
        (WebCore::HTMLSelectElement::dispatchBlurEvent): Fire onChange on blur.
        (WebCore::HTMLSelectElement::menuListDefaultEventHandler): Fire
        onChange when using the Enter key to change the selection.
        * html/HTMLSelectElement.h:
        * rendering/RenderMenuList.cpp:
        (WebCore::RenderMenuList::updateFromElement): Extract setText logic
        into its own method.
        (WebCore::RenderMenuList::setTextFromOption): New method.
        (WebCore::RenderMenuList::valueChanged): Let setSelectedIndex call
        onChange instead of calling it directly here.
        * rendering/RenderMenuList.h:

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 059de859ecfb98214dc93e935ac1a52bd909e77c..a1c12624d06fb617169d04447f52f20abd0c3249 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2006-10-10  Adam Roben  <aroben@apple.com>
+
+        Reviewed by Adele.
+
+        Improve popup menu behavior.
+
+        * html/HTMLSelectElement.cpp:
+        (WebCore::HTMLSelectElement::HTMLSelectElement): Cache
+        m_lastOnChangeIndex so we know when to fire onChange.
+        (WebCore::HTMLSelectElement::setSelectedIndex): Added parameter to
+        specify whether we should fire onChange.
+        (WebCore::HTMLSelectElement::dispatchBlurEvent): Fire onChange on blur.
+        (WebCore::HTMLSelectElement::menuListDefaultEventHandler): Fire
+        onChange when using the Enter key to change the selection.
+        * html/HTMLSelectElement.h:
+        * rendering/RenderMenuList.cpp:
+        (WebCore::RenderMenuList::updateFromElement): Extract setText logic
+        into its own method.
+        (WebCore::RenderMenuList::setTextFromOption): New method.
+        (WebCore::RenderMenuList::valueChanged): Let setSelectedIndex call
+        onChange instead of calling it directly here.
+        * rendering/RenderMenuList.h:
+
 2006-10-10  Adele Peterson  <adele@apple.com>
 
         Reviewed by Beth. 

diff --git a/WebCore/html/HTMLSelectElement.cpp b/WebCore/html/HTMLSelectElement.cpp
index bf571bb1cb36f008840b11ec6a3a59c05d9de40e..03e69771f174019d096a2be5034a7d865f0e01dd 100644 (file)
--- a/WebCore/html/HTMLSelectElement.cpp
+++ b/WebCore/html/HTMLSelectElement.cpp
@@ -66,6 +66,7 @@ HTMLSelectElement::HTMLSelectElement(Document* doc, HTMLFormElement* f)
     , m_size(0)
     , m_multiple(false)
     , m_recalcListItems(false)
+    , m_lastOnChangeIndex(0)
 {
     document()->registerFormElementWithState(this);
 }
@@ -153,7 +154,7 @@ void HTMLSelectElement::deselectItems(HTMLOptionElement* excludeElement)
     }
 }
 
-void HTMLSelectElement::setSelectedIndex(int index, bool deselect)
+void HTMLSelectElement::setSelectedIndex(int index, bool deselect, bool fireOnChange)
 {
     const Vector<HTMLElement*>& items = listItems();
     int listIndex = optionToListIndex(index);
@@ -164,6 +165,10 @@ void HTMLSelectElement::setSelectedIndex(int index, bool deselect)
     }
     if (deselect)
         deselectItems(element);
+    if (fireOnChange) {
+        m_lastOnChangeIndex = index;
+        onChange();
+    }
 }
 
 int HTMLSelectElement::length() const
@@ -512,6 +517,16 @@ void HTMLSelectElement::notifyOptionSelected(HTMLOptionElement *selectedOption,
     setChanged(true);
 }
 
+void HTMLSelectElement::dispatchBlurEvent()
+{
+#if !ARROW_KEYS_POP_MENU
+    if (selectedIndex() != m_lastOnChangeIndex) {
+        m_lastOnChangeIndex = selectedIndex();
+        onChange();
+    }
+#endif
+    HTMLGenericFormElement::dispatchBlurEvent();
+}
 void HTMLSelectElement::defaultEventHandler(Event* evt)
 {
     if (usesMenuList())
@@ -555,7 +570,10 @@ void HTMLSelectElement::menuListDefaultEventHandler(Event* evt)
             if (index > 0)
                 setSelectedIndex(--index);
             handled = true;
+        } else if (keyIdentifier == "Enter" && index != m_lastOnChangeIndex) {
+            setSelectedIndex(index, true, true);
         }
+
 #endif
         if (handled)
             evt->setDefaultHandled();

diff --git a/WebCore/html/HTMLSelectElement.h b/WebCore/html/HTMLSelectElement.h
index c7e782912a904452f0ed7f44179c7bd339a06f62..f1194f172d388673ba6f6156b59f35b71b61c205 100644 (file)
--- a/WebCore/html/HTMLSelectElement.h
+++ b/WebCore/html/HTMLSelectElement.h
@@ -54,8 +54,10 @@ public:
 
     virtual void recalcStyle(StyleChange);
 
+    virtual void dispatchBlurEvent();
+
     int selectedIndex() const;
-    void setSelectedIndex(int index, bool deselect = true);
+    void setSelectedIndex(int index, bool deselect = true, bool fireOnChange = false);
     void notifyOptionSelected(HTMLOptionElement* selectedOption, bool selected);
     
     virtual bool isEnumeratable() const { return true; }
@@ -136,6 +138,7 @@ private:
     int m_size;
     bool m_multiple;
     mutable bool m_recalcListItems;
+    int m_lastOnChangeIndex;
 
     HTMLCollection::CollectionInfo m_collectionInfo;
 };

diff --git a/WebCore/rendering/RenderMenuList.cpp b/WebCore/rendering/RenderMenuList.cpp
index 942660eb675813c4f9e6d6d6cc262a2e14105113..27bb4ab16900183838f45a1849bfd26f188b7f6d 100644 (file)
--- a/WebCore/rendering/RenderMenuList.cpp
+++ b/WebCore/rendering/RenderMenuList.cpp
@@ -120,7 +120,16 @@ void RenderMenuList::updateFromElement()
         m_optionsChanged = false;
     }
 
-    int i = select->optionToListIndex(select->selectedIndex());
+    setTextFromOption(select->selectedIndex());
+}
+
+void RenderMenuList::setTextFromOption(int optionIndex)
+{
+    HTMLSelectElement* select = static_cast<HTMLSelectElement*>(node());
+    const Vector<HTMLElement*>& listItems = select->listItems();
+    int size = listItems.size();
+
+    int i = select->optionToListIndex(optionIndex);
     String text = "";
     if (i >= 0 && i < size) {
         HTMLElement* element = listItems[i];
@@ -235,11 +244,10 @@ void RenderMenuList::hidePopup()
     m_popupIsVisible = false;
 }
 
-void RenderMenuList::valueChanged(unsigned listIndex)
+void RenderMenuList::valueChanged(unsigned listIndex, bool fireOnChange)
 {
     HTMLSelectElement* select = static_cast<HTMLSelectElement*>(node());
-    select->setSelectedIndex(select->listToOptionIndex(listIndex));
-    select->onChange();
+    select->setSelectedIndex(select->listToOptionIndex(listIndex), true, fireOnChange);
 }
 
 }

diff --git a/WebCore/rendering/RenderMenuList.h b/WebCore/rendering/RenderMenuList.h
index 85656cd6f9cad7a45017effbb8eae413fcaa3a7c..34344f9c0fa9573ee8c8b965c208792046a8f2f7 100644 (file)
--- a/WebCore/rendering/RenderMenuList.h
+++ b/WebCore/rendering/RenderMenuList.h
@@ -57,9 +57,10 @@ public:
     void hidePopup();
 
     void setOptionsChanged(bool c) { m_optionsChanged = c; }
-    void valueChanged(unsigned listIndex);
+    void valueChanged(unsigned listIndex, bool fireOnChange = true);
 
     String text();
+    void setTextFromOption(int optionIndex);
 
 protected:
     virtual bool hasLineIfEmpty() const { return true; }