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

WIP working on getting Core project to build

Browse Source
This commit is contained in:
Shannon
2015-12-18 13:29:12 +01:00
parent 2ea9418fd7
commit 5c5a5d12cc
73 changed files with 372 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/Configuration/Grid/GridEditorsConfig.cs
View File

@@ -32,6 +32,8 @@ namespace Umbraco.Core.Configuration.Grid
{
Func<List<GridEditor>> getResult = () =>
{
var parser = new ManifestParser(_logger, _appPlugins, _runtimeCache);
var editors = new List<GridEditor>();
var gridConfig = Path.Combine(_configFolder.FullName, "grid.editors.config.js");
if (File.Exists(gridConfig))
@@ -40,7 +42,7 @@ namespace Umbraco.Core.Configuration.Grid
{
var arr = JArray.Parse(File.ReadAllText(gridConfig));
//ensure the contents parse correctly to objects
var parsed = ManifestParser.GetGridEditors(arr);
var parsed = parser.GetGridEditors(arr);
editors.AddRange(parsed);
}
catch (Exception ex)
@@ -49,7 +51,7 @@ namespace Umbraco.Core.Configuration.Grid
}
}
var parser = new ManifestParser(_appPlugins, _runtimeCache);
var builder = new ManifestBuilder(_runtimeCache, parser);
foreach (var gridEditor in builder.GridEditors)
{

4
src/Umbraco.Core/Configuration/UmbracoConfig.cs
View File

@@ -105,10 +105,7 @@ namespace Umbraco.Core.Configuration
return _umbracoSettings;
}
}
/// <summary>
/// Only for testing
/// </summary>
@@ -129,6 +126,7 @@ namespace Umbraco.Core.Configuration
}
return _gridConfig;
}
//TODO: Add other configurations here !
}