From 9ceb5305d52b5f60cedf14b9fd66947cec4bf1ea Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Thu, 15 Dec 2016 13:55:45 +0100
Subject: [PATCH] Enables sections to wrapped around selected code

---
 .../src/views/templates/edit.controller.js          | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
index 81f04015ea..ae1560bffb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
@@ -274,7 +274,7 @@
 
             vm.sectionsOverlay = {
                 view: "templatesections",
-                isMasterTemplate: true,
+                hasMaster: vm.template.masterTemplateAlias,
                 submitButtonLabel: "Insert",
                 show: true,
                 submit: function(model) {
@@ -288,7 +288,7 @@
                     }
 
                     if (model.insertType === 'addSection') {
-                        insert("@section " + model.sectionName + "\r\n{\r\n\r\n}\r\n");
+                        wrap("@section " + model.sectionName + "\r\n{\r\n\r\n\t{0}\r\n\r\n}\r\n");
                     }
 
                     vm.sectionsOverlay.show = false;
@@ -393,12 +393,21 @@
             vm.editor.navigateFileStart();
         }
 
+
         function insert(str) {
             vm.editor.moveCursorToPosition(vm.currentPosition);
             vm.editor.insert(str);
             vm.editor.focus();
         }
 
+        function wrap(str) {
+
+            var selectedContent = vm.editor.session.getTextRange(vm.editor.getSelectionRange());
+            str = str.replace("{0}", selectedContent);
+            vm.editor.insert(str);
+            vm.editor.focus();
+        }
+
         function persistCurrentLocation() {
             vm.currentPosition = vm.editor.getCursorPosition();
         }