Merge pull request #7059 from mfendeksilverstripe/3.5

Html editor selection is now properly stored while the dialog is open
This commit is contained in:
Daniel Hensby 2017-07-05 15:03:18 +01:00 committed by GitHub
commit f769d9a13f

View File

@ -868,14 +868,15 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
// // Element contains a link
// var firstLinkEl = selectedEl.find('a:first');
// if(firstLinkEl.length) linkDataSource = firstLinkEl;
// if(linkDataSource && linkDataSource.length) this.modifySelection(function(ed){
// ed.selectNode(linkDataSource[0]);
// });
} else {
// Element is a child of a link
linkDataSource = selectedEl = selectedEl.parents('a:first');
}
}
if(linkDataSource && linkDataSource.length) this.modifySelection(function(ed){
ed.selectNode(linkDataSource[0]);
});
// Is anchor not a link
if (!linkDataSource.attr('href')) linkDataSource = null;