From a584b27c35fde4cbe06144f5f84a9fd5cfa31c3f Mon Sep 17 00:00:00 2001
From: Daniel Stolt <daniel@ideliverable.com>
Date: Sat, 6 Feb 2016 23:54:40 +0100
Subject: [PATCH] Changed to manual bootstrapping of LayoutEditor Angular app.
 Fixes #5722.

---
 .../Views/EditorTemplates/LayoutEditor.cshtml         | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Views/EditorTemplates/LayoutEditor.cshtml b/src/Orchard.Web/Modules/Orchard.Layouts/Views/EditorTemplates/LayoutEditor.cshtml
index f4ecbc725..581073e6c 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Views/EditorTemplates/LayoutEditor.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Views/EditorTemplates/LayoutEditor.cshtml
@@ -26,11 +26,12 @@
     Style.Include("LayoutEditor.css", "LayoutEditor.min.css");
     Script.Include("LayoutDesignerHost.js");
 
-    // The grid system
+    // The grid system.
     Style.Include("default-grid.css");
 
     using (Script.Foot()) {
         <script>
+
             angular
                 .module("LayoutEditor")
                 .constant("environment", {
@@ -38,7 +39,10 @@
                         return "@Url.Action("Get", "Template", new { area = "Orchard.Layouts" })" + "/" + templateName;
                     }
                 });
-            jQuery(function () {
+
+            angular.bootstrap($(".layout-editor-holder")[0], ["LayoutEditor"]);
+
+            $(function () {
                 var editorConfig = JSON.parse(LayoutEditor.decode("@Html.Raw(Url.Encode(Model.ConfigurationData))"));
                 var editorCanvasData = JSON.parse(LayoutEditor.decode("@Html.Raw(Url.Encode(Model.Data))"));
                 var layoutEditor = window.layoutEditor = new LayoutEditor.Editor(editorConfig, editorCanvasData);
@@ -56,6 +60,7 @@
                     });
                 });
             });
+
         </script>
     }
 
@@ -102,7 +107,7 @@
             </ol>
         </div>
         <div class="layout-editor-holder">
-            <orc-layout-editor model="window.layoutEditor" ng-app="LayoutEditor" />
+            <orc-layout-editor model="window.layoutEditor" />
         </div>
         @Display.DialogTemplate(Name: "Layout")
         <div class="layout-editor-help-dialog" title="@T("Layout editor help")">