Got the legacy editors working and iframe implementation almost done!

This commit is contained in:
Shannon
2013-06-25 08:54:36 +10:00
parent 5af8e86e3b
commit 39d7676bee
25 changed files with 783 additions and 365 deletions

View File

@@ -2,6 +2,7 @@
using System.Text.RegularExpressions;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Umbraco.Core.IO;
using Umbraco.Core.Manifest;
namespace Umbraco.Web.UI.JavaScript
@@ -40,7 +41,9 @@ namespace Umbraco.Web.UI.JavaScript
ManifestParser.MergeJArrays(umbracoInit, m.JavaScriptInitialize);
}
return ParseMain(umbracoInit.ToString());
return ParseMain(
umbracoInit.ToString(),
IOHelper.ResolveUrl(SystemDirectories.Umbraco));
}
/// <summary>

View File

@@ -5,6 +5,8 @@
'lib/bootstrap/js/bootstrap.js',
'lib/underscore/underscore.js',
'lib/umbraco/Extensions.js',
'lib/umbraco/NamespaceManager.js',
'lib/umbraco/LegacyUmbClientMgr.js',
'js/app.js',

View File

@@ -3,6 +3,10 @@ yepnope({
load: "##JsInitialize##",
complete: function () {
//we need to set the legacy UmbClientMgr path
UmbClientMgr.setUmbracoPath('"##UmbracoPath##"');
jQuery(document).ready(function () {
angular.bootstrap(document, ['umbraco']);
});