From eaaccdad75e390e2e003ae69dfc4be7e08e26cb9 Mon Sep 17 00:00:00 2001 From: Allyen Date: Wed, 17 Jun 2015 14:57:15 +0200 Subject: [PATCH] Fixed bug in U4-6593 - After sort, reset the TinyMCE editors with previous settings --- .../src/views/propertyeditors/grid/grid.controller.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js index 3ccbffcfa6..22a001824a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js @@ -129,6 +129,9 @@ angular.module("umbraco") }, start: function (e, ui) { + // reset dragged RTE settings in case a RTE isn't dragged + draggedRteSettings = undefined; + ui.item.find('.mceNoEditor').each(function () { notIncludedRte = []; @@ -148,12 +151,14 @@ angular.module("umbraco") } }); $timeout(function () { - // reconstruct the dragged RTE - tinyMCE.init(draggedRteSettings); + // reconstruct the dragged RTE (could be undefined when dragging something else than RTE) + if (draggedRteSettings !== undefined) { + tinyMCE.init(draggedRteSettings); + } _.forEach(notIncludedRte, function (id) { // reset all the other RTEs - if (id != draggedRteSettings.id) { + if (draggedRteSettings === undefined || id != draggedRteSettings.id) { var rteSettings = _.findWhere(tinyMCE.editors, { id: id }).settings; tinyMCE.execCommand('mceRemoveEditor', false, id); tinyMCE.init(rteSettings);