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

List:       kde-commits
Subject:    kdelibs/khtml/xml
From:       Germain Garand <germain () ebooksfrance ! com>
Date:       2004-06-13 2:25:35
Message-ID: 20040613022535.E8539126DD () office ! kde ! org
[Download RAW message or body]

CVS commit by ggarand: 

HTML tags lookup: refining 1.276/1.280

CCMAIL: zack@kde.org


  M +3 -3      dom_docimpl.cpp   1.281


--- kdelibs/khtml/xml/dom_docimpl.cpp  #1.280:1.281
@@ -1657,5 +1657,5 @@ typedef int (*IdLookupFunction)(const ch
 
 NodeImpl::Id DocumentImpl::getId( NodeImpl::IdType _type, DOMStringImpl* _nsURI, \
                DOMStringImpl *_prefix,
-                                  DOMStringImpl *_name, bool readonly, bool \
/*lookupHTML*/, int *pExceptioncode) +                                  DOMStringImpl \
*_name, bool readonly, bool lookupHTML, int *pExceptioncode)  {
     /*kdDebug() << "DocumentImpl::getId( type: " << _type << ", uri: " << \
DOMString(_nsURI).string() @@ -1692,10 +1692,10 @@ NodeImpl::Id DocumentImpl::getId( \
NodeIm  QConstString n(_name->s, _name->l);
     bool cs = true; // case sensitive
-    if (_type != NodeImpl::NamespaceId) {
+    if (lookupHTML && _type != NodeImpl::NamespaceId) {
         // Each document maintains a mapping of tag name -> id for every tag name \
encountered  // in the document.
         cs = (htmlMode() == XHtml);
         // First see if it's a HTML element name
-        if (!_nsURI || !strcasecmp(_nsURI, XHTML_NAMESPACE)) {
+        if ((!_nsURI && isHTMLDocument()) || !strcasecmp(_nsURI, XHTML_NAMESPACE)) {
             // we're in HTML namespace if we know the tag.
             // xhtml is lower case - case sensitive, easy to implement


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