[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit ec89d8aa2f925df2462b90a02c878b8ccc7c0312
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 26 22:31:12 2004 +0000

            Reviewed by Dave.
    
            - fixed <rdar://problem/3532519>: <select> menus show label property instead of tag contents (ups.com time and cost site)
    
            * khtml/html/html_formimpl.cpp: (HTMLOptionElementImpl::text): Ignore the label property as
            a quirk. Neither WinIE nor Mozilla implement the label property, so neither shall we (except
            on strict pages, where we just go crazy and do everything "right").
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5977 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ef91dfe..d52826b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-01-26  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - fixed <rdar://problem/3532519>: <select> menus show label property instead of tag contents (ups.com time and cost site)
+
+        * khtml/html/html_formimpl.cpp: (HTMLOptionElementImpl::text): Ignore the label property as
+        a quirk. Neither WinIE nor Mozilla implement the label property, so neither shall we (except
+        on strict pages, where we just go crazy and do everything "right").
+
 2004-01-26  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Hyatt
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index e3dae73..22289b8 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -2564,7 +2564,10 @@ DOMString HTMLOptionElementImpl::type() const
 
 DOMString HTMLOptionElementImpl::text() const
 {
-    DOMString label = getAttribute(ATTR_LABEL);
+    DOMString label;
+    // WinIE does not use the label attribute, so as a quirk, we ignore it.
+    if (getDocument() && !getDocument()->inCompatMode())
+        label = getAttribute(ATTR_LABEL);
     if (label.isEmpty() && firstChild() && firstChild()->nodeType() == Node::TEXT_NODE) {
 	if (firstChild()->nextSibling()) {
 	    DOMString ret = "";

-- 
WebKit Debian packaging