diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-image-helper.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-image-helper.spec.js
new file mode 100644
index 0000000000..55325397ac
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/test/unit/common/services/umb-image-helper.spec.js
@@ -0,0 +1,38 @@
+describe('icon helper tests', function () {
+ var umbImageHelper;
+
+ beforeEach(module('umbraco.services'));
+ beforeEach(module('umbraco.mocks'));
+
+ beforeEach(inject(function ($injector) {
+ umbImageHelper = $injector.get('umbImageHelper');
+ }));
+
+ describe('basic utility methods return correct values', function () {
+
+ it('detects an image based file', function () {
+
+ var image1 = "a-jpeg.jpg";
+ var image2 = "a-png.png";
+ var image3 = "thisisagif.blah.gif";
+ var doc1 = "anormaldocument.doc";
+
+ expect(umbImageHelper.detectIfImageByExtension(image1)).toBe(true);
+ expect(umbImageHelper.detectIfImageByExtension(image2)).toBe(true);
+ expect(umbImageHelper.detectIfImageByExtension(image3)).toBe(true);
+ expect(umbImageHelper.detectIfImageByExtension(doc1)).toBe(false);
+ });
+
+ it('gets a thumbnail path', function () {
+
+ var image1 = "a-jpeg.jpg";
+ var image2 = "a-png.png";
+ var image3 = "thisisagif.blah.gif";
+
+ expect(umbImageHelper.getThumbnailFromPath(image1)).toBe("a-jpeg_thumb.jpg");
+ expect(umbImageHelper.getThumbnailFromPath(image2)).toBe("a-png_thumb.jpg");
+ expect(umbImageHelper.getThumbnailFromPath(image3)).toBe("thisisagif.blah_thumb.jpg");
+ });
+
+ });
+});
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 66d25afd0a..9a8e3f7012 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -2599,7 +2599,7 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\"
True
6130
/
-
http://localhost:6130
+
http://localhost:6230
False
False
diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs
index 7383d2b806..486b5f4035 100644
--- a/src/Umbraco.Web/Editors/BackOfficeController.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeController.cs
@@ -66,7 +66,8 @@ namespace Umbraco.Web.Editors
{
"umbracoSettings", new Dictionary
{
- {"umbracoPath", GlobalSettings.Path}
+ {"umbracoPath", GlobalSettings.Path},
+ {"imageFileTypes", UmbracoSettings.ImageFileTypes},
}
},
{ "isDebuggingEnabled", HttpContext.IsDebuggingEnabled }
diff --git a/src/Umbraco.Web/PropertyEditors/FileUploadValueEditor.cs b/src/Umbraco.Web/PropertyEditors/FileUploadValueEditor.cs
index fbdcfec45c..f1a0983e71 100644
--- a/src/Umbraco.Web/PropertyEditors/FileUploadValueEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/FileUploadValueEditor.cs
@@ -6,6 +6,7 @@ using System.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
using Umbraco.Core.Media;
using Umbraco.Core.Models.Editors;
using Umbraco.Core.PropertyEditors;
@@ -45,32 +46,30 @@ namespace Umbraco.Web.PropertyEditors
//check the editorValue value to see if we need to clear the files or not
var clear = false;
if (editorValue.Value.IsNullOrWhiteSpace() == false)
- {
- var parsed = JObject.Parse(editorValue.Value);
- clear = parsed["clearFiles"].Value();
- }
-
- //parse the current value
- var currentPersistedValues = new JArray();
- if (currentValue != null)
{
try
{
- currentPersistedValues = JArray.Parse(currentValue.ToString());
+ var parsed = JObject.Parse(editorValue.Value);
+ clear = parsed["clearFiles"].Value();
}
catch (JsonReaderException)
{
- //if we cannot parse, we'll ignore the error and start again, there must be a bad value stored for some reason
+ clear = false;
}
}
- var newValue = new JArray();
+ var currentPersistedValues = new string[] {};
+ if (currentValue != null)
+ {
+ currentPersistedValues = currentValue.ToString().Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries);
+ }
+
+ var newValue = new List();
if (clear)
{
//TODO: Need to delete our old files!
-
- return newValue.ToString(Formatting.None);
+ return "";
}
//check for any files
@@ -87,8 +86,8 @@ namespace Umbraco.Web.PropertyEditors
{
var file = filesAsArray[i];
- var currentPersistedFile = currentPersistedValues.Count >= (i + 1)
- ? currentPersistedValues[i]["file"].ToString()
+ var currentPersistedFile = currentPersistedValues.Length >= (i + 1)
+ ? currentPersistedValues[i]
: "";
var name = IOHelper.SafeFileName(file.FileName.Substring(file.FileName.LastIndexOf(IOHelper.DirSepChar) + 1, file.FileName.Length - file.FileName.LastIndexOf(IOHelper.DirSepChar) - 1).ToLower());
@@ -110,18 +109,8 @@ namespace Umbraco.Web.PropertyEditors
{
var umbracoFile = UmbracoFile.Save(fileStream, fileName);
- //create json to be saved
- var forPersisting = JObject.FromObject(new
- {
- file = umbracoFile.Url,
- isImage = false
- });
-
-
if (umbracoFile.SupportsResizing)
{
- forPersisting["isImage"] = true;
-
// make default thumbnail
umbracoFile.Resize(100, "thumb");
@@ -137,23 +126,22 @@ namespace Umbraco.Web.PropertyEditors
}
}
}
-
- //add this to the persisted values
- newValue.Add(forPersisting);
+ newValue.Add(umbracoFile.Url);
}
//now remove the temp file
- File.Delete(file.TempFilePath);
+ File.Delete(file.TempFilePath);
}
-
+
//TODO: We need to remove any files that were previously persisted but are no longer persisted. FOr example, if we
// uploaded 5 files before and then only uploaded 3, then the last two should be deleted.
- return newValue.ToString(Formatting.None);
+ return string.Join(",", newValue);
}
}
//if we've made it here, we had no files to save and we were not clearing anything so just persist the same value we had before
return currentValue;
}
+
}
}
\ No newline at end of file