From 4a24abca17d76405a4c5fa2e2379c899bef81864 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Sun, 2 Jun 2013 18:42:17 -1000
Subject: [PATCH] Fixes issues with requirejs not loading in things in order.

---
 src/Umbraco.Web.UI/umbraco/Views/Default.cshtml      | 4 +++-
 src/Umbraco.Web.UI/umbraco/Views/common/tree.html    | 1 +
 src/Umbraco.Web.UI/umbraco/js/umbraco.controllers.js | 2 +-
 src/Umbraco.Web.UI/umbraco/js/umbraco.directives.js  | 2 +-
 src/Umbraco.Web.UI/umbraco/js/umbraco.resources.js   | 2 +-
 src/Umbraco.Web.UI/umbraco/js/umbraco.services.js    | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
index 72b12107bc..7d66ac7d65 100644
--- a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
@@ -63,7 +63,9 @@
     
     @*We cannot use the data-main attribute above because we need to load in the application 
     via a server side JavaScript request, so we just request it after requirejs*@
-    <script src="@Url.Action("Application", "BackOffice")" type="text/javascript"></script>
+    <script type="text/javascript">
+        require(["@Url.Action("Application", "BackOffice").EnsureEndsWith('/')"]);
+    </script>
 
 </body>
 </html>
diff --git a/src/Umbraco.Web.UI/umbraco/Views/common/tree.html b/src/Umbraco.Web.UI/umbraco/Views/common/tree.html
index 4c27139baa..b56462afc0 100644
--- a/src/Umbraco.Web.UI/umbraco/Views/common/tree.html
+++ b/src/Umbraco.Web.UI/umbraco/Views/common/tree.html
@@ -3,6 +3,7 @@
     ul.umb-tree li ul li ul {
         padding-left: 20px;
     }
+
 </style>
 
 <script type="text/ng-template"  id="tree_item_renderer.html">
diff --git a/src/Umbraco.Web.UI/umbraco/js/umbraco.controllers.js b/src/Umbraco.Web.UI/umbraco/js/umbraco.controllers.js
index 55f346631c..ade25187ec 100644
--- a/src/Umbraco.Web.UI/umbraco/js/umbraco.controllers.js
+++ b/src/Umbraco.Web.UI/umbraco/js/umbraco.controllers.js
@@ -5,7 +5,7 @@
  * Licensed MIT
  */
 
-define(['angular'], function (angular) {
+define(['angular', 'app'], function (angular, app) {
 
    
     //Handles the section area of the app
diff --git a/src/Umbraco.Web.UI/umbraco/js/umbraco.directives.js b/src/Umbraco.Web.UI/umbraco/js/umbraco.directives.js
index e09efde460..327d7c0f7d 100644
--- a/src/Umbraco.Web.UI/umbraco/js/umbraco.directives.js
+++ b/src/Umbraco.Web.UI/umbraco/js/umbraco.directives.js
@@ -4,7 +4,7 @@
  * Licensed MIT
  */
 'use strict';
-define(['angular'], function (angular) {
+define(['angular', 'app'], function (angular, app) {
 
     /**
     * @ngdoc directive 
diff --git a/src/Umbraco.Web.UI/umbraco/js/umbraco.resources.js b/src/Umbraco.Web.UI/umbraco/js/umbraco.resources.js
index 83aa11617b..ad3b0bd8a1 100644
--- a/src/Umbraco.Web.UI/umbraco/js/umbraco.resources.js
+++ b/src/Umbraco.Web.UI/umbraco/js/umbraco.resources.js
@@ -4,7 +4,7 @@
  * Licensed MIT
  */
 'use strict';
-define(['angular'], function (angular) {
+define(['angular', 'app'], function (angular, app) {
 
     /**
  * @ngdoc factory 
diff --git a/src/Umbraco.Web.UI/umbraco/js/umbraco.services.js b/src/Umbraco.Web.UI/umbraco/js/umbraco.services.js
index 120e224d76..4f7efda46a 100644
--- a/src/Umbraco.Web.UI/umbraco/js/umbraco.services.js
+++ b/src/Umbraco.Web.UI/umbraco/js/umbraco.services.js
@@ -1,5 +1,5 @@
 'use strict';
-define(['angular'], function (angular) {
+define(['angular', 'app'], function (angular, app) {
 angular.module('umbraco.services.dialog', [])
 .factory('dialog', ['$rootScope', '$compile', '$http', '$timeout', '$q', '$templateCache', function($rootScope, $compile, $http, $timeout, $q, $templateCache) {