[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/khtml/rendering
From:       Maks Orlovich <maksim () kde ! org>
Date:       2010-04-05 0:23:59
Message-ID: 20100405002359.C181AAC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1111169 by orlovich:

Erk. Make <option label> work outside <optgroup>, too. I am a bit worried about this, \
though, since both Firefox and WebCore fail at this.

BUG: 198092


 M  +7 -8      render_form.cpp  


--- trunk/KDE/kdelibs/khtml/rendering/render_form.cpp #1111168:1111169
@@ -1744,21 +1744,20 @@
                 HTMLOptionElementImpl* optElem = \
static_cast<HTMLOptionElementImpl*>(listItems[listIndex]);  
                 DOMString domText = optElem->text();
+                // Prefer label if set
+                DOMString label = optElem->getAttribute(ATTR_LABEL);
+                if (!label.isEmpty())
+                    domText = label.string();
+                domText = domText.implementation()->collapseWhiteSpace(false, \
false); +
                 QString   text;
 
                 ElementImpl* parentOptGroup = optElem->parentNode()->id() == \
                ID_OPTGROUP ?
                                                  \
static_cast<ElementImpl*>(optElem->parentNode()) : 0;  
-                if (parentOptGroup) {
-                    // Prefer label if set
-                    DOMString label = optElem->getAttribute(ATTR_LABEL);
-                    if (!label.isEmpty())
-                        domText = label.string();
-                    domText = domText.implementation()->collapseWhiteSpace(false, \
                false);
-                        
+                if (parentOptGroup) {        
                     text = QLatin1String("    ") + domText.string();
                 } else {
-                    domText = domText.implementation()->collapseWhiteSpace(false, \
false);  text = domText.string();
                 }
 


[prev in list] [next in list] [prev in thread] [next in thread]