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

Fixed #U4-1323 Stripping umbraco path out of source is not needed any more

Browse Source
This commit is contained in:
Sebastiaan Janssen
2012-12-26 05:54:34 -01:00
parent 6c8c37256b
commit 3bd487d092
1 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/umbraco.editorControls/tinymce/tinyMCEImageHelper.cs
View File

@@ -72,8 +72,6 @@ namespace umbraco.editorControls.tinymce
}
else
{
cleanTag = StripSrc(cleanTag, ht);
if (helper.FindAttribute(ht, "width") != "")
{
cleanTag += " width=\"" + helper.FindAttribute(ht, "width") + "\"";
@@ -84,10 +82,6 @@ namespace umbraco.editorControls.tinymce
}
else
{
// Add src, width and height properties
cleanTag = StripSrc(cleanTag, ht);
if (helper.FindAttribute(ht, "width") != "")
{
cleanTag += " width=\"" + helper.FindAttribute(ht, "width") + "\"";
@@ -118,22 +112,6 @@ namespace umbraco.editorControls.tinymce
return html;
}
private static string StripSrc(string cleanTag, Hashtable ht)
{
string src = helper.FindAttribute(ht, "src");
//get the media folder, minus the starting '~'
string mediaRoot = global::Umbraco.Core.IO.SystemDirectories.Media.Replace("~", string.Empty);
// update orgSrc to remove umbraco reference
int mediaRootIndex = src.IndexOf(mediaRoot);
if (mediaRootIndex > -1)
src = src.Substring(mediaRootIndex, src.Length - mediaRootIndex);
cleanTag += " src=\"" + src + "\"";
return cleanTag;
}
private static string doResize(Hashtable attributes, out int finalWidth, out int finalHeight)
{
var fs = FileSystemProviderManager.Current.GetFileSystemProvider<MediaFileSystem>();