From e481f4e0afd1fd147e6b99b5359bbd646b8a29ee Mon Sep 17 00:00:00 2001 From: hartvig Date: Wed, 4 Jul 2012 09:15:16 -0200 Subject: [PATCH] Adds the new resize logic to the Richtext Editor (tinymce) as well --- src/umbraco.editorControls/tinymce/tinyMCEImageHelper.cs | 9 ++++++--- src/umbraco.editorControls/uploadfield/uploadField.cs | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/umbraco.editorControls/tinymce/tinyMCEImageHelper.cs b/src/umbraco.editorControls/tinymce/tinyMCEImageHelper.cs index 13d3ea6d42..b99d25fe9b 100644 --- a/src/umbraco.editorControls/tinymce/tinyMCEImageHelper.cs +++ b/src/umbraco.editorControls/tinymce/tinyMCEImageHelper.cs @@ -6,6 +6,7 @@ using System.Drawing.Imaging; using System.Text.RegularExpressions; using System.Web; using umbraco.BusinessLogic; +using umbraco.cms.businesslogic.Files; using umbraco.IO; namespace umbraco.editorControls.tinymce @@ -164,12 +165,13 @@ namespace umbraco.editorControls.tinymce orgSrc = SystemDirectories.Media + orgSrc.Substring(orgSrc.IndexOf(resolvedMedia) + resolvedMedia.Length); //, orgSrc.Length - orgSrc.IndexOf(String.Format("/media/", SystemDirectories.Media))); } - string ext = orgSrc.Substring(orgSrc.LastIndexOf(".") + 1, orgSrc.Length - orgSrc.LastIndexOf(".") - 1); - newSrc = orgSrc.Replace("." + ext, "_" + newWidth.ToString() + "x" + newHeight.ToString() + ".jpg"); string fullSrc = IOHelper.MapPath(orgSrc); - string fullSrcNew = IOHelper.MapPath(newSrc); + UmbracoFile uf = new UmbracoFile(fullSrc); + newSrc = uf.Resize(newWidth, newHeight); + + /* // Load original image Image image = Image.FromFile(fullSrc); @@ -200,6 +202,7 @@ namespace umbraco.editorControls.tinymce // Save the new image bp.Save(fullSrcNew, codec, ep); + * */ } // return the new width and height diff --git a/src/umbraco.editorControls/uploadfield/uploadField.cs b/src/umbraco.editorControls/uploadfield/uploadField.cs index 83a8d54fff..bfdc419033 100644 --- a/src/umbraco.editorControls/uploadfield/uploadField.cs +++ b/src/umbraco.editorControls/uploadfield/uploadField.cs @@ -268,7 +268,7 @@ namespace umbraco.editorControls try { hasThumb = File.Exists(IOHelper.MapPath(IOHelper.FindFile(fileNameThumb))); - // 4.8.0 added support for png thumbnails + // 4.8.0 added support for png thumbnails (but for legacy it might have been jpg - hence the check before) if (!hasThumb && (ext == "gif" || ext == "png")) { fileNameThumb = _text.Replace("." + ext, "_thumb.png");