diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
index 37dea64c21..d62d76c982 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
@@ -144,31 +144,28 @@ function fileUploadController($scope, $element, $compile, imageHelper, fileManag
};
angular.module("umbraco")
.controller('Umbraco.PropertyEditors.FileUploadController', fileUploadController)
- .run(function(mediaHelper, umbRequestHelper){
+ .run(function(mediaHelper, umbRequestHelper, assetsService){
if (mediaHelper && mediaHelper.registerFileResolver) {
-
- //NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource
- // they contain different data structures so if we need to query against it we need to be aware of this.
- mediaHelper.registerFileResolver("Umbraco.UploadField", function(property, entity, thumbnail){
- if (thumbnail) {
-
- if (mediaHelper.detectIfImageByExtension(property.value)) {
-
- var thumbnailUrl = umbRequestHelper.getApiUrl(
- "imagesApiBaseUrl",
- "GetBigThumbnail",
- [{ originalImagePath: property.value }]);
-
- return thumbnailUrl;
- }
- else {
- return null;
- }
-
+ assetsService.load(["lib/moment/moment-with-locales.js"]).then(
+ function () {
+ //NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource
+ // they contain different data structures so if we need to query against it we need to be aware of this.
+ mediaHelper.registerFileResolver("Umbraco.UploadField", function(property, entity, thumbnail){
+ if (thumbnail) {
+ if (mediaHelper.detectIfImageByExtension(property.value)) {
+ //get default big thumbnail from image processor
+ var thumbnailUrl = property.value + "?rnd=" + moment(entity.updateDate).format("YYYYMMDDHHmmss") + "&width=500";
+ return thumbnailUrl;
+ }
+ else {
+ return null;
+ }
+ }
+ else {
+ return property.value;
+ }
+ });
}
- else {
- return property.value;
- }
- });
+ );
}
- });
\ No newline at end of file
+ });
diff --git a/src/Umbraco.Web/Editors/ImagesController.cs b/src/Umbraco.Web/Editors/ImagesController.cs
index f69f84ca86..416ffc2553 100644
--- a/src/Umbraco.Web/Editors/ImagesController.cs
+++ b/src/Umbraco.Web/Editors/ImagesController.cs
@@ -104,8 +104,6 @@ namespace Umbraco.Web.Editors
return GetResized(imagePath, width, Convert.ToString(width));
}
- //TODO: We should delegate this to ImageProcessing
-
///
/// Gets a resized image - if the requested max width is greater than the original image, only the original image will be returned.
///
@@ -124,53 +122,11 @@ namespace Umbraco.Web.Editors
return Request.CreateResponse(HttpStatusCode.NotFound);
}
- var thumbFilePath = imagePath.TrimEnd(ext) + "_" + suffix + ext;
- var fullOrgPath = mediaFileSystem.GetFullPath(mediaFileSystem.GetRelativePath(imagePath));
- var fullNewPath = mediaFileSystem.GetFullPath(mediaFileSystem.GetRelativePath(thumbFilePath));
- var thumbIsNew = mediaFileSystem.FileExists(fullNewPath) == false;
- if (thumbIsNew)
- {
- //we need to generate it
- if (mediaFileSystem.FileExists(fullOrgPath) == false)
- {
- return Request.CreateResponse(HttpStatusCode.NotFound);
- }
-
- using (var fileStream = mediaFileSystem.OpenFile(fullOrgPath))
- {
- if (fileStream.CanSeek) fileStream.Seek(0, 0);
- using (var originalImage = Image.FromStream(fileStream))
- {
- //If it is bigger, then do the resize
- if (originalImage.Width >= width && originalImage.Height >= width)
- {
- ImageHelper.GenerateThumbnail(
- originalImage,
- width,
- fullNewPath,
- ext.Replace(".", ""),
- mediaFileSystem);
- }
- else
- {
- //just return the original image
- fullNewPath = fullOrgPath;
- }
-
- }
- }
- }
-
- var result = Request.CreateResponse(HttpStatusCode.OK);
- //NOTE: That we are not closing this stream as the framework will do that for us, if we try it will
- // fail. See http://stackoverflow.com/questions/9541351/returning-binary-file-from-controller-in-asp-net-web-api
- var stream = mediaFileSystem.OpenFile(fullNewPath);
- if (stream.CanSeek) stream.Seek(0, 0);
- result.Content = new StreamContent(stream);
- result.Headers.Date = mediaFileSystem.GetLastModified(imagePath);
- result.Content.Headers.ContentType = new MediaTypeHeaderValue(System.Web.MimeMapping.GetMimeMapping(imagePath));
-
- return result;
+ //redirect to ImageProcessor thumbnail with rnd generated from last modified time of original media file
+ var response = Request.CreateResponse( HttpStatusCode.Found );
+ var imageLastModified = mediaFileSystem.GetLastModified( imagePath );
+ response.Headers.Location = new Uri( string.Format( "{0}?rnd={1}&width={2}", imagePath, string.Format( "{0:yyyyMMddHHmmss}", imageLastModified ), width ), UriKind.Relative );
+ return response;
}
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs b/src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
index e4ff4da1d6..221dde865f 100644
--- a/src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
@@ -63,10 +63,10 @@ namespace Umbraco.Web.PropertyEditors
clear = json["clearFiles"].Value();
}
- var currentPersistedValues = new string[] {};
+ var currentPersistedValues = new string[] { };
if (string.IsNullOrEmpty(currentValue.ToString()) == false)
{
- currentPersistedValues = currentValue.ToString().Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries);
+ currentPersistedValues = currentValue.ToString().Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
}
var newValue = new List();
@@ -82,7 +82,7 @@ namespace Umbraco.Web.PropertyEditors
}
return "";
}
-
+
//check for any files
if (editorValue.AdditionalData.ContainsKey("files"))
{
@@ -131,13 +131,13 @@ namespace Umbraco.Web.PropertyEditors
if (umbracoFile.SupportsResizing)
{
var additionalSizes = new List();
- //get the pre-vals value
+ //get the pre-vals value
var thumbs = editorValue.PreValues.FormatAsDictionary();
if (thumbs.Any())
{
var thumbnailSizes = thumbs.First().Value.Value;
- // additional thumbnails configured as prevalues on the DataType
- foreach (var thumb in thumbnailSizes.Split(new[] { ";", "," }, StringSplitOptions.RemoveEmptyEntries))
+ // additional thumbnails configured as prevalues on the DataType
+ foreach (var thumb in thumbnailSizes.Split(new[] { ";", "," }, StringSplitOptions.RemoveEmptyEntries))
{
int thumbSize;
if (thumb == "" || int.TryParse(thumb, out thumbSize) == false) continue;
@@ -149,22 +149,22 @@ namespace Umbraco.Web.PropertyEditors
{
ImageHelper.GenerateMediaThumbnails(fs, fileName, umbracoFile.Extension, image, additionalSizes);
}
-
}
+
newValue.Add(umbracoFile.Url);
//add to the saved paths
savedFilePaths.Add(umbracoFile.Url);
}
//now remove the temp file
- File.Delete(file.TempFilePath);
+ File.Delete(file.TempFilePath);
}
-
+
//Remove any files that are no longer saved for this item
foreach (var toRemove in currentPersistedValues.Except(savedFilePaths))
{
fs.DeleteFile(fs.GetRelativePath(toRemove), true);
}
-
+
return string.Join(",", newValue);
}