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

List:       kde-commits
Subject:    branches/KDE/3.5/kdewebdev/quanta
From:       Andras Mantia <amantia () kde ! org>
Date:       2006-09-08 13:21:38
Message-ID: 1157721698.527011.9792.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 582175 by amantia:

Fix automatic updating of closing tags (don't search for the closing tag for single \
tags). 

BUG: 132357

 M  +1 -0      ChangeLog  
 M  +6 -4      src/document.cpp  


--- branches/KDE/3.5/kdewebdev/quanta/ChangeLog #582174:582175
@@ -17,6 +17,7 @@
       - respect the order of items in the .docrc [#133704]
       - fix crash when creating project through slow links [#133705]
       - really abort if a remote directory cannot be created [#117032]
+      - fix automatic updating of closing tags [#132357]
 
 
 Version 3.5.4 (Release date: 02-08-2006; Started 24-06-2005):
--- branches/KDE/3.5/kdewebdev/quanta/src/document.cpp #582174:582175
@@ -2296,7 +2296,9 @@
       viewCursorIf->cursorPositionReal(&line, &column);
       node = parser->nodeAt(line, column, false);
       if (node &&
-          (node->tag->type==Tag::XmlTag || node->tag->type == Tag::XmlTagEnd) )
+          ((node->tag->type == Tag::XmlTag && !node->tag->single) ||
+            node->tag->type == Tag::XmlTagEnd)
+           )
       {
         Tag *tag;
         tag = new Tag(*node->tag);
@@ -2322,7 +2324,7 @@
       node = parser->nodeAt(line, column, false);
       if (node &&
           node->tag->nameSpace + node->tag->name != currentNode->tag->nameSpace + \
                currentNode->tag->name &&
-          (node->tag->type == Tag::XmlTag || node->tag->type == Tag::XmlTagEnd) && \
node->tag->validXMLTag) +          ((node->tag->type == Tag::XmlTag && \
!node->tag->single) || node->tag->type == Tag::XmlTagEnd) && node->tag->validXMLTag)  \
{  int bl, bc, bl2, bc2;
         node->tag->beginPos(bl, bc);
@@ -2339,7 +2341,7 @@
           previousNode = 0L;
         }
         if (bl == bl2 && bc == bc2 &&
-           (currentNode->tag->type == Tag::XmlTag || currentNode->tag->type == \
Tag::XmlTagEnd)) +           ((node->tag->type == Tag::XmlTag && !node->tag->single) \
|| currentNode->tag->type == Tag::XmlTagEnd))  {
           QString newName = node->tag->name;
           bool updateClosing = (currentNode->tag->type == Tag::XmlTag) && \
!newName.startsWith("!"); @@ -2352,7 +2354,7 @@
             node = node->previousSibling();
           while (node)
           {
-            if (node->tag->validXMLTag && (node->tag->type == Tag::XmlTag || \
node->tag->type == Tag::XmlTagEnd)) +            if (node->tag->validXMLTag && \
((node->tag->type == Tag::XmlTag && !node->tag->single) || node->tag->type == \
Tag::XmlTagEnd))  {
               if (node->tag->nameSpace + node->tag->name == \
currentNode->tag->nameSpace + currentNode->tag->name )  {


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