yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #718 from WebCentrum/dev-v7-gridsort2

Browse Source 
Fixed bug in U4-6593 - After sort, reset the TinyMCE editors with previous settings
This commit is contained in:
Shannon Deminick
2015-06-17 15:22:52 +02:00
parent be84db097a eaaccdad75
commit 221183d791
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
View File

@@ -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);