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

List:       kde-commits
Subject:    branches/KDE/4.1/kdelibs/khtml/css
From:       Germain Garand <germain () ebooksfrance ! org>
Date:       2008-09-15 4:11:41
Message-ID: 1221451901.760914.17639.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 861068 by ggarand:

automatically merged revision 857213:
adapt to change in Glazman's CSS3 selector test.

contains/begins/ends attribute selectors should not match at all
when their associated expression is empty.

 M  +3 -3      cssstyleselector.cpp  


--- branches/KDE/4.1/kdelibs/khtml/css/cssstyleselector.cpp #861067:861068
@@ -1288,21 +1288,21 @@
             //kDebug( 6080 ) << "checking for contains match";
             QString val_str = QString::fromRawData(value->unicode(), \
                value->length());
             QString sel_str = QString::fromRawData(sel->value.unicode(), \
                sel->value.length());
-            return val_str.contains(sel_str, caseSensitive ? \
Qt::CaseSensitive : Qt::CaseInsensitive); +            return \
val_str.contains(sel_str, caseSensitive ? Qt::CaseSensitive : \
Qt::CaseInsensitive) && !sel_str.isEmpty();  }
         case CSSSelector::Begin:
         {
             //kDebug( 6080 ) << "checking for beginswith match";
             QString val_str = QString::fromRawData(value->unicode(), \
                value->length());
             QString sel_str = QString::fromRawData(sel->value.unicode(), \
                sel->value.length());
-            return val_str.startsWith(sel_str, caseSensitive ? \
Qt::CaseSensitive : Qt::CaseInsensitive); +            return \
val_str.startsWith(sel_str, caseSensitive ? Qt::CaseSensitive : \
Qt::CaseInsensitive) && !sel_str.isEmpty();  }
         case CSSSelector::End:
         {
             //kDebug( 6080 ) << "checking for endswith match";
             QString val_str = QString::fromRawData(value->unicode(), \
                value->length());
             QString sel_str = QString::fromRawData(sel->value.unicode(), \
                sel->value.length());
-            return val_str.endsWith(sel_str, caseSensitive ? \
Qt::CaseSensitive : Qt::CaseInsensitive); +            return \
val_str.endsWith(sel_str, caseSensitive ? Qt::CaseSensitive : \
Qt::CaseInsensitive) && !sel_str.isEmpty();  }
         case CSSSelector::Hyphen:
         {


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