yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Completes U4-2744 Remove very old TinyMCE 2 and all that is related to it

Browse Source
This commit is contained in:
Shannon
2013-08-29 17:45:16 +10:00
parent 52700c0c18
commit 339ee11dc0
6 changed files with 5 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Tests/CodeFirst/TestModels/ModelWithNewDataType.cs
View File

@@ -1,6 +1,6 @@
using Umbraco.Tests.CodeFirst.Attributes;
using umbraco.editorControls.textfield;
using umbraco.editorControls.tinymce;
using umbraco.editorControls.tinyMCE3;
namespace Umbraco.Tests.CodeFirst.TestModels
{
@@ -9,7 +9,7 @@ namespace Umbraco.Tests.CodeFirst.TestModels
[PropertyType(typeof(TextFieldDataType), PropertyGroup = "Content")]
public string Title { get; set; }
[PropertyType(typeof(TinyMCEDataType), PropertyGroup = "Content")]
[PropertyType(typeof(tinyMCE3dataType), PropertyGroup = "Content")]
public string BodyContent { get; set; }
}
}

2
src/umbraco.editorControls/tinyMCE3/webcontrol/plugin/GzipModule.cs
View File

@@ -9,7 +9,7 @@ using System;
using System.Web;
using System.Text.RegularExpressions;
using System.IO;
using umbraco.IO;
using Umbraco.Core.IO;
namespace umbraco.editorControls.tinyMCE3.webcontrol.plugin
{

53
src/umbraco.editorControls/tinymce/TinyMCEDataType.cs
View File

@@ -1,53 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
using Umbraco.Core;
namespace umbraco.editorControls.tinymce
{
public class TinyMCEDataType : umbraco.cms.businesslogic.datatype.BaseDataType, umbraco.interfaces.IDataType
{
private umbraco.interfaces.IDataEditor _Editor;
private umbraco.interfaces.IData _baseData;
private umbraco.interfaces.IDataPrevalue _prevalueeditor;
public override umbraco.interfaces.IDataEditor DataEditor
{
get
{
if (_Editor == null)
_Editor = new TinyMCELegacyControl();
return _Editor;
}
}
public override umbraco.interfaces.IData Data
{
get
{
if (_baseData == null)
_baseData = new cms.businesslogic.datatype.DefaultData(this);
return _baseData;
}
}
public override Guid Id
{
get { return new Guid(Constants.PropertyEditors.TinyMCE); }
}
public override string DataTypeName
{
get { return "TinyMCE wysiwyg (Obsolete, upgrade to tinymce v3!)"; }
}
public override umbraco.interfaces.IDataPrevalue PrevalueEditor
{
get
{
if (_prevalueeditor == null)
_prevalueeditor = new TinyMCELegacyControl();
return _prevalueeditor;
}
}
}
}

70
src/umbraco.editorControls/tinymce/TinyMCELegacyControl.cs
View File

@@ -1,70 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using umbraco.interfaces;
using System.Web.UI.WebControls;
using System.Drawing;
namespace umbraco.editorControls.tinymce
{
class TinyMCELegacyControl : WebControl, IDataEditor, IDataPrevalue
{
protected Label lbl;
protected override void CreateChildControls()
{
base.CreateChildControls();
lbl = new Label();
lbl.ID = "InvalidDataTypeLabel";
lbl.Text = "This is an old version of the Richtext Editor (TinyMCE2), which is deprecated and no longer supported in Umbraco 4. Please upgrade by going to >> Developer >> Data Types >> Richtext editor >> And choose \"TinyMCE3 wysiwyg\" as the rendercontrol. If you don't have administrative priviledges in umbraco, you should contact your administrator";
lbl.ForeColor = Color.Red;
lbl.Font.Bold = true;
this.Controls.Add(lbl);
}
#region IDataEditor Members
public void Save()
{
}
public bool ShowLabel
{
get { return false; }
}
public bool TreatAsRichTextEditor
{
get { return false; }
}
public System.Web.UI.Control Editor
{
get
{
return this;
}
}
#endregion
#region IDataPrevalue Members
void IDataPrevalue.Save()
{
}
System.Web.UI.Control IDataPrevalue.Editor
{
get { return this; }
}
#endregion
}
}

4
src/umbraco.editorControls/tinymce/tinyMCEConfiguration.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text;
using System.Collections;
using System.Xml;
using umbraco.IO;
using Umbraco.Core.IO;
namespace umbraco.editorControls.tinymce
{
@@ -44,7 +44,7 @@ namespace umbraco.editorControls.tinymce
}
public static string PluginPath = IOHelper.ResolveUrl( SystemDirectories.Umbraco ) + "/plugins/tinymce3";
public static string JavascriptPath = IOHelper.ResolveUrl( SystemDirectories.Umbraco_client ) + "/tinymce3";
public static string JavascriptPath = IOHelper.ResolveUrl( SystemDirectories.UmbracoClient ) + "/tinymce3";
private static string _invalidElements;

2
src/umbraco.editorControls/umbraco.editorControls.csproj
View File

@@ -387,8 +387,6 @@
<SubType>Code</SubType>
</Compile>
<Compile Include="tinymce\tinyMCEConfiguration.cs" />
<Compile Include="tinymce\TinyMCEDataType.cs" />
<Compile Include="tinymce\TinyMCELegacyControl.cs" />
<Compile Include="tinymce\tinyMCEImageHelper.cs" />
<Compile Include="tinymce\tinyMCEPreValueConfigurator.cs" />
<Compile Include="userControlWrapper\SerializationHelper.cs" />