From 5b79d780f7f4cc4a97d39cd2bd5c7a373fefffcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Kottal?= <snielsen43@gmail.com>
Date: Fri, 27 Sep 2019 08:39:36 +0200
Subject: [PATCH] enables infinite editing for partial views

---
 .../src/views/partialviews/edit.controller.js | 28 +++++++++++++------
 .../src/views/partialviews/edit.html          | 22 ++++++++++-----
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
index 51cca0b5af..ddeab9d1cd 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
@@ -4,6 +4,18 @@
     function PartialViewsEditController($scope, $routeParams, codefileResource, assetsService, notificationsService, editorState, navigationService, appState, macroService, angularHelper, $timeout, contentEditingHelper, localizationService, templateHelper, editorService) {
 
         var vm = this;
+        var infiniteMode = $scope.model && $scope.model.infiniteMode;
+        var id = infiniteMode ? $scope.model.id : $routeParams.id;
+        var create = infiniteMode ? $scope.model.create : $routeParams.create;
+        var snippet = infiniteMode ? $scope.model.snippet : $routeParams.snippet;
+
+        function close() {
+            if ($scope.model.close) {
+                $scope.model.close($scope.model);
+            }
+        }
+
+        vm.close = close;
 
         vm.page = {};
         vm.page.loading = true;
@@ -249,20 +261,18 @@
             //we need to load this somewhere, for now its here.
             assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css", $scope);
 
-            if ($routeParams.create) {
-                
-                var snippet = "Empty";
+            if (create) {
 
-                if($routeParams.snippet) {
-                    snippet = $routeParams.snippet;
+                if (!snippet) {
+                    snippet = "Empty";
                 }
 
-                codefileResource.getScaffold("partialViews", $routeParams.id, snippet).then(function (partialView) {
+                codefileResource.getScaffold("partialViews", id, snippet).then(function (partialView) {
                     ready(partialView, false);
                 });
                 
             } else {
-                codefileResource.getByPath('partialViews', $routeParams.id).then(function (partialView) {
+                codefileResource.getByPath('partialViews', id).then(function (partialView) {
                     ready(partialView, true);
                 });
             }
@@ -277,7 +287,7 @@
             //sync state
             editorState.set(vm.partialView);
 
-            if (syncTree) {
+            if (!infiniteMode && syncTree) {
                 navigationService.syncTree({ tree: "partialViews", path: vm.partialView.path, forceReload: true }).then(function (syncArgs) {
                     vm.page.menu.currentNode = syncArgs.node;
                 });
@@ -362,7 +372,7 @@
                     // initial cursor placement
                     // Keep cursor in name field if we are create a new template
                     // else set the cursor at the bottom of the code editor
-                    if(!$routeParams.create) {
+                    if(!create) {
                         $timeout(function(){
                             vm.editor.navigateFileEnd();
                             vm.editor.focus();
diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
index 8bffd55748..0b218f927c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
@@ -69,13 +69,21 @@
                 </umb-editor-footer-content-left>
 
                 <umb-editor-footer-content-right>
-                    <umb-button
-                        type="submit"
-                        button-style="success"
-                        state="vm.page.saveButtonState"
-                        shortcut="ctrl+s"
-                        label="Save"
-                        label-key="buttons_save">
+
+                    <umb-button ng-if="model.infiniteMode"
+                                type="button"
+                                button-style="link"
+                                label-key="general_close"
+                                shortcut="esc"
+                                action="vm.close()">
+                    </umb-button>
+                        
+                    <umb-button type="submit"
+                                button-style="success"
+                                state="vm.page.saveButtonState"
+                                shortcut="ctrl+s"
+                                label="Save"
+                                label-key="buttons_save">
                     </umb-button>
                 </umb-editor-footer-content-right>