Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ angular.module("umbraco.directives")
//custom initialization for this editor within the grid
editor.on('init', function (e) {

//register global variable to re-save the dragged RTE settings in the controller
editor.settings = baseLineConfigObj;

// Used this init event - as opposed to property init_instance_callback
// to turn off the loader
scope.isLoading = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ angular.module("umbraco")
ui.item.find(".umb-rte").each(function (key, value) {
// remove all RTEs in the dragged row and save their settings
var rteId = value.id;
var editor = _.findWhere(tinyMCE.editors, { id: rteId });
var editor = _.findWhere(tinyMCE.get() , { id: rteId });
if (editor) {
draggedRteSettings[rteId] = editor.settings;
}
Expand All @@ -92,7 +92,7 @@ angular.module("umbraco")
var rteId = value.id;
var settings = draggedRteSettings[rteId];
if (!settings) {
var editor = _.findWhere(tinyMCE.editors, { id: rteId });
var editor = _.findWhere(tinyMCE.get() , { id: rteId });
if (editor) {
settings = editor.settings;
}
Expand Down Expand Up @@ -189,7 +189,7 @@ angular.module("umbraco")
if ($.inArray(rteId, notIncludedRte) < 0) {

// remember this RTEs settings, cause we need to update it later.
var editor = _.findWhere(tinyMCE.editors, { id: rteId })
var editor = _.findWhere(tinyMCE.get(), { id: rteId })
if (editor) {
draggedRteSettings[rteId] = editor.settings;
}
Expand All @@ -203,9 +203,8 @@ angular.module("umbraco")
var rteId = $(this).attr("id");

if ($.inArray(rteId, notIncludedRte) < 0) {

// remember this RTEs settings, cause we need to update it later.
var editor = _.findWhere(tinyMCE.editors, { id: rteId })
var editor = _.findWhere(tinyMCE.get() , { id: rteId })
if (editor) {
draggedRteSettings[rteId] = editor.settings;
}
Expand Down Expand Up @@ -236,7 +235,7 @@ angular.module("umbraco")
var rteId = value.id;

// remember this RTEs settings, cause we need to update it later.
var editor = _.findWhere(tinyMCE.editors, { id: rteId });
var editor = _.findWhere(tinyMCE.get() , { id: rteId });

// save the dragged RTE settings
if (editor) {
Expand All @@ -258,7 +257,7 @@ angular.module("umbraco")
var rteId = value.id;
if ($.inArray(rteId, notIncludedRte) < 0) {

var editor = _.findWhere(tinyMCE.editors, { id: rteId });
var editor = _.findWhere(tinyMCE.get() , { id: rteId });
if (editor) {
draggedRteSettings[rteId] = editor.settings;
}
Expand Down
Loading