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 #4981 from JorisDebonnet/patch-1

Browse Source 
Fix incomplete functionality from #3734
This commit is contained in:
Damian Mooyman 2016-01-26 18:52:44 +13:00
commit 5952e38208
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
javascript/HtmlEditorField.js
View File

@ -888,10 +888,11 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
action = "update"; action = "update";
} }
if(href.match(/^mailto:(.*)$/)) { if(href.match(/^mailto:([^?]*)(\?subject=(.*))?$/)) {
return { return {
LinkType: 'email', LinkType: 'email',
email: RegExp.$1, email: RegExp.$1,
Subject: decodeURIComponent(RegExp.$3),
Description: title Description: title
}; };
} else if(href.match(/^(assets\/.*)$/) || href.match(/^\[file_link\s*(?:\s*|%20|,)?id=([0-9]+)\]?(#.*)?$/)) { } else if(href.match(/^(assets\/.*)$/) || href.match(/^\[file_link\s*(?:\s*|%20|,)?id=([0-9]+)\]?(#.*)?$/)) {