tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7059 from mfendeksilverstripe/3.5

Browse Source 
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
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
javascript/HtmlEditorField.js
View File

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