update to usercontrol wrapper, detect if value is xml (if it is, don't store in cdata)
This commit is contained in:
@@ -344,6 +344,7 @@
|
||||
<Compile Include="tinymce\TinyMCELegacyControl.cs" />
|
||||
<Compile Include="tinymce\tinyMCEImageHelper.cs" />
|
||||
<Compile Include="tinymce\tinyMCEPreValueConfigurator.cs" />
|
||||
<Compile Include="userControlWrapper\usercontrolData.cs" />
|
||||
<Compile Include="wysiwyg\editorButton.cs" />
|
||||
<Compile Include="tinyMCE3\TinyMCE.cs" />
|
||||
<Compile Include="tinyMCE3\tinyMCE3dataType.cs" />
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Xml;
|
||||
|
||||
namespace umbraco.editorControls.userControlGrapper
|
||||
{
|
||||
public class usercontrolData : umbraco.cms.businesslogic.datatype.DefaultData
|
||||
{
|
||||
public usercontrolData(umbraco.cms.businesslogic.datatype.BaseDataType DataType) : base(DataType) { }
|
||||
|
||||
|
||||
public override System.Xml.XmlNode ToXMl(System.Xml.XmlDocument data)
|
||||
{
|
||||
|
||||
if (this.Value != null)
|
||||
{
|
||||
|
||||
XmlDocument xd = new XmlDocument();
|
||||
|
||||
try
|
||||
{
|
||||
xd.LoadXml(this.Value.ToString());
|
||||
return data.ImportNode(xd.DocumentElement, true);
|
||||
}
|
||||
catch
|
||||
{
|
||||
return base.ToXMl(data);
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
return base.ToXMl(data);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -31,7 +31,7 @@ namespace umbraco.editorControls.userControlGrapper
|
||||
get
|
||||
{
|
||||
if (_baseData == null)
|
||||
_baseData = new umbraco.cms.businesslogic.datatype.DefaultData(this);
|
||||
_baseData = new usercontrolData(this);
|
||||
return _baseData;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user