upgraded other projs to 4.5, added page to render for back office for, now to get requirejs wired up properly as its not returning the correct

paths.
This commit is contained in:
Shannon Deminick
2013-05-27 01:23:49 -10:00
parent faae0b85cb
commit cdbd1b504f
30 changed files with 17051 additions and 51 deletions

View File

@@ -1,13 +1,7 @@
{
/*NOTE: This is actually /Belle/js because we are loading in requireJs from /Belle already*/
baseUrl: 'js',
{
waitSeconds: 120,
paths: {
jquery: '../lib/jquery/jquery-1.8.2.min',
jqueryCookie: '../lib/jquery/jquery.cookie',
bootstrap: '../lib/bootstrap/js/bootstrap',
underscore: '../lib/underscore/underscore',
angular: '../lib/angular/angular',
angularResource: '../lib/angular/angular-resource',
@@ -15,7 +9,7 @@
text: '../lib/require/text',
async: '../lib/require/async',
namespaceMgr: '../lib/Umbraco/NamespaceManager',
myApp: '../../../Content/JavaScript/myApp'
myApp: '../js/myApp'
},
shim: {
'angular' : {'exports' : 'angular'},

View File

@@ -11,14 +11,12 @@ namespace Umbraco.Web.UI.JavaScript
/// main Umbraco initialization output.
/// </summary>
internal class RequireJsInit
{
private readonly DirectoryInfo _pluginsDir;
{
private readonly ManifestParser _parser;
public RequireJsInit(DirectoryInfo pluginsDir)
public RequireJsInit(ManifestParser parser)
{
_pluginsDir = pluginsDir;
_parser = new ManifestParser(_pluginsDir);
_parser = parser;
}
private static readonly Regex Token = new Regex("(\"##\\w+?##\")", RegexOptions.Compiled);

View File

@@ -17,7 +17,7 @@ namespace Umbraco.Web.UI.JavaScript
internal static string Parse(Dictionary<string, object> items)
{
var vars = JsResources.ServerVariables;
var vars = Resources.ServerVariables;
if (Parsing != null)
{