From 44c966bd4479198a94fdcfa0fdb9cf99c8a05289 Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Thu, 8 Aug 2019 11:37:18 +0100 Subject: [PATCH] Moves our Umbraco angular loader component to only hide itself once the tinymce editor has initialized --- .../src/views/propertyeditors/rte/rte.controller.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 3ed5f49b92..52b105201e 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 @@ -57,7 +57,10 @@ angular.module("umbraco") var baseLineConfigObj = { maxImageSize: editorConfig.maxImageSize, width: width, - height: height + height: height, + init_instance_callback: function(editor){ + $scope.isLoading = false; + } }; angular.extend(baseLineConfigObj, standardConfig); @@ -84,9 +87,6 @@ angular.module("umbraco") $timeout(function () { tinymce.DOM.events.domLoaded = true; tinymce.init(baseLineConfigObj); - - $scope.isLoading = false; - }, 200); }