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

Simplifies the IContentSection so that there's no nesting of interface classes and updates some unit tests

Browse Source
This commit is contained in:
Shannon
2013-09-16 15:52:59 +10:00
parent 81b43545c1
commit 09b68a75be
65 changed files with 577 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/Models/ContentExtensions.cs
View File

@@ -416,15 +416,15 @@ namespace Umbraco.Core.Models
fs.AddFile(fileName, fileStream);
//Check if file supports resizing and create thumbnails
var supportsResizing = UmbracoConfiguration.Current.UmbracoSettings.Content.Imaging.ImageFileTypes.InvariantContains(extension);
var supportsResizing = UmbracoConfiguration.Current.UmbracoSettings.Content.ImageFileTypes.InvariantContains(extension);
//the config section used to auto-fill properties
IContentImagingAutoFillUploadField uploadFieldConfigNode = null;
//Check for auto fill of additional properties
if (UmbracoConfiguration.Current.UmbracoSettings.Content.Imaging.ImageAutoFillProperties != null)
if (UmbracoConfiguration.Current.UmbracoSettings.Content.ImageAutoFillProperties != null)
{
uploadFieldConfigNode = UmbracoConfiguration.Current.UmbracoSettings.Content.Imaging.ImageAutoFillProperties
uploadFieldConfigNode = UmbracoConfiguration.Current.UmbracoSettings.Content.ImageAutoFillProperties
.Single(x => x.Alias == propertyTypeAlias);
}

10
src/Umbraco.Core/Models/Script.cs
View File

@@ -14,18 +14,18 @@ namespace Umbraco.Core.Models
[DataContract(IsReference = true)]
public class Script : File
{
private readonly IContentScriptEditor _scriptEditorConfig;
private readonly IContentSection _contentConfig;
public Script(string path)
: this(path, UmbracoConfiguration.Current.UmbracoSettings.Content.ScriptEditor)
: this(path, UmbracoConfiguration.Current.UmbracoSettings.Content)
{
}
public Script(string path, IContentScriptEditor scriptEditorConfig)
public Script(string path, IContentSection contentConfig)
: base(path)
{
_scriptEditorConfig = scriptEditorConfig;
_contentConfig = contentConfig;
base.Path = path;
}
@@ -44,7 +44,7 @@ namespace Umbraco.Core.Models
//into 4 private methods.
//See codeEditorSave.asmx.cs for reference.
var exts = _scriptEditorConfig.ScriptFileTypes.ToList();
var exts = _contentConfig.ScriptFileTypes.ToList();
/*if (UmbracoSettings.DefaultRenderingEngine == RenderingEngine.Mvc)
{
exts.Add("cshtml");