universaleditor/editor-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug in XMLDataFormat with reading CDATA sections. The entire XMLDataFormat really has to be rewritten...

Browse Source
This commit is contained in:
Michael Becker 2014-08-08 09:47:49 -04:00
parent a85e256784
commit 4c42aad90c
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
CSharp/Plugins/UniversalEditor.Essential/DataFormats/Markup/XML/XMLDataFormat.cs
View File

@ -434,29 +434,36 @@ namespace UniversalEditor.DataFormats.Markup.XML
}
else
{
insideTagValue = true;
if (insideAttributeArea)
if (insideSpecialDeclaration)
{
(currentElement as MarkupTagElement).Attributes.Add(nextAttributeName, this.ReplaceEntitiesInput(currentString));
nextAttributeName = null;
insideAttributeArea = false;
insideSpecialDeclaration = false;
}
else
{
MarkupElement prevElement = currentElement;
currentElement = new MarkupTagElement();
currentElement.FullName = currentString.Trim();
if (prevElement != null && prevElement is MarkupContainerElement)
insideTagValue = true;
if (insideAttributeArea)
{
(prevElement as MarkupContainerElement).Elements.Add(currentElement);
(currentElement as MarkupTagElement).Attributes.Add(nextAttributeName, this.ReplaceEntitiesInput(currentString));
nextAttributeName = null;
insideAttributeArea = false;
}
else
{
mom.Elements.Add(currentElement);
}
if (Settings.AutoCloseTagNames.Contains(currentElement.Name))
{
currentElement = currentElement.Parent;
MarkupElement prevElement = currentElement;
currentElement = new MarkupTagElement();
currentElement.FullName = currentString.Trim();
if (prevElement != null && prevElement is MarkupContainerElement)
{
(prevElement as MarkupContainerElement).Elements.Add(currentElement);
}
else
{
mom.Elements.Add(currentElement);
}
if (Settings.AutoCloseTagNames.Contains(currentElement.Name))
{
currentElement = currentElement.Parent;
}
}
}
}
@ -800,7 +807,7 @@ namespace UniversalEditor.DataFormats.Markup.XML
char padNext = tr.ReadChar();
padNext = tr.ReadChar();
insideSpecialDeclaration = false;
// insideSpecialDeclaration = false;
continue;
}
else