Fixed more tree merge issues, fixed how property editors are rendered.

2013-06-04 15:59:14 -10:00
parent c932f31f40
commit fea28df758
6 changed files with 146 additions and 69 deletions
--- a/src/Umbraco.Web/UI/JavaScript/RequireJsConfig.js
+++ b/src/Umbraco.Web/UI/JavaScript/RequireJsConfig.js
@@ -19,7 +19,8 @@
        tinymce: '../lib/tinymce/tinymce.min',
        text: '../lib/require/text',
        async: '../lib/require/async',
-        css: '../lib/require/css'
+        css: '../lib/require/css',
+        namespaceMgr: '../lib/Umbraco/NamespaceManager',
    },
    shim: {
        'umbracoExtensions' : {'exports' : 'umbracoExtensions'},
--- a/src/Umbraco.Web/UI/JavaScript/RequireJsInitialize.js
+++ b/src/Umbraco.Web/UI/JavaScript/RequireJsInitialize.js
@@ -12,5 +12,6 @@
    'umbraco.controllers',
    'sample.propertyeditor.controller',
    'sampletwo.propertyeditor.controller',
-    'routes'
+    'routes',
+    'namespaceMgr'
 ]