From 493d7010badda64d02e9f1fa895778b97d79ea0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 24 Sep 2019 17:10:20 +0200
Subject: [PATCH] Reverting to use element ID to initialisation

---
 .../src/views/propertyeditors/rte/rte.controller.js   | 11 +++++++----
 .../src/views/propertyeditors/rte/rte.html            |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index f4af762dc5..f78eedab33 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -1,13 +1,16 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.RTEController",
-        function ($scope, $q, assetsService, $timeout, tinyMceService, angularHelper, tinyMceAssets, $element) {
+        function ($scope, $q, assetsService, $timeout, tinyMceService, angularHelper, tinyMceAssets) {
 
             // TODO: A lot of the code below should be shared between the grid rte and the normal rte
 
             $scope.isLoading = true;
             
-            var editorNode = $element[0].querySelector('.umb-rte-editor');
-
+            //To id the html textarea we need to use the datetime ticks because we can have multiple rte's per a single property alias
+            // because now we have to support having 2x (maybe more at some stage) content editors being displayed at once. This is because
+            // we have this mini content editor panel that can be launched with MNTP.
+            $scope.textAreaHtmlId = $scope.model.alias + "_" + String.CreateGuid();
+            
             var editorConfig = $scope.model.config ? $scope.model.config.editor : null;
             if (!editorConfig || angular.isString(editorConfig)) {
                 editorConfig = tinyMceService.defaultPrevalues();
@@ -35,7 +38,7 @@ angular.module("umbraco")
             var tinyMceEditor = null;
 
             promises.push(tinyMceService.getTinyMceEditorConfig({
-                target: editorNode,
+                htmlId: $scope.textAreaHtmlId,
                 stylesheets: editorConfig.stylesheets,
                 toolbar: editorConfig.toolbar,
                 mode: editorConfig.mode
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
index 9b3867e1e7..d2cf29d75a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
@@ -2,6 +2,6 @@
     <umb-load-indicator ng-if="isLoading"></umb-load-indicator>
 
     <div class="umb-rte-editor-con">
-        <div class="umb-rte-editor" ng-style="{ width: containerWidth, height: containerHeight, overflow: containerOverflow}"></div>
+        <div id="{{textAreaHtmlId}}" class="umb-rte-editor" ng-style="{ width: containerWidth, height: containerHeight, overflow: containerOverflow}"></div>
     </div>
 </div>