Fixes: U4-3110 Cant create new relationstype - ensures that the legacy action js path references are included

This commit is contained in:
Shannon
2013-10-15 16:18:55 +11:00
parent 35545019a5
commit c42170cf6b
4 changed files with 18 additions and 9 deletions

View File

@@ -34,13 +34,19 @@ namespace Umbraco.Web.UI.JavaScript
/// <summary>
/// Processes all found manifest files and outputs the main.js file containing all plugin manifests
/// </summary>
public string GetJavascriptInitialization(JArray umbracoInit)
public string GetJavascriptInitialization(JArray umbracoInit, JArray additionalJsFiles = null)
{
foreach (var m in _parser.GetManifests())
{
ManifestParser.MergeJArrays(umbracoInit, m.JavaScriptInitialize);
}
//merge in the additional ones specified if there are any
if (additionalJsFiles != null)
{
ManifestParser.MergeJArrays(umbracoInit, additionalJsFiles);
}
return ParseMain(
umbracoInit.ToString(),
IOHelper.ResolveUrl(SystemDirectories.Umbraco));