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 #1936 from mikg0/patch-1

Browse Source 
Fix file link recognition in HtmlEditorField.js
This commit is contained in:
Ingo Schommer 2013-05-22 07:43:11 -07:00
commit 214515f232
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
javascript/HtmlEditorField.js
View File

@ -716,7 +716,7 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
email: RegExp.$1, email: RegExp.$1,
Description: title Description: title
}; };
} else if(href.match(/^(assets\/.*)$/) || href.match(/^\[file_link\s*(?:%20)?id=([0-9]+)\]?(#.*)?$/)) { } else if(href.match(/^(assets\/.*)$/) || href.match(/^\[file_link\s*(?:\s*|%20|,)?id=([0-9]+)\]?(#.*)?$/)) {
return { return {
LinkType: 'file', LinkType: 'file',
file: RegExp.$1, file: RegExp.$1,