mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
fixes for WCM-511 and WCM-512
- preserve anchor (#anchor) urls in tinymce - better error handling in file picker widget - disabling next while in the midst of adding a rendering engine (usability fix) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6058 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -27,19 +27,25 @@
|
||||
|
||||
function alfresco_TinyMCE_urlconverter_callback(href, element, onsave)
|
||||
{
|
||||
// dojo.debug("request to convert " + href + " onsave = " + onsave);
|
||||
var result = null;
|
||||
if (onsave)
|
||||
{
|
||||
return (href && href.startsWith(alfresco.constants.AVM_WEBAPP_URL)
|
||||
? href.substring(alfresco.constants.AVM_WEBAPP_URL.length)
|
||||
: href);
|
||||
result = (href && href.startsWith(alfresco.constants.AVM_WEBAPP_URL)
|
||||
? href.substring(alfresco.constants.AVM_WEBAPP_URL.length)
|
||||
: href);
|
||||
}
|
||||
else
|
||||
{
|
||||
return (href && href.startsWith("/")
|
||||
? alfresco.constants.AVM_WEBAPP_URL + href
|
||||
: href);
|
||||
result = (href && href.startsWith("/")
|
||||
? alfresco.constants.AVM_WEBAPP_URL + href
|
||||
: href);
|
||||
}
|
||||
if (href && href.startsWith(document.location.href))
|
||||
{
|
||||
result = href.substring(document.location.href.length);
|
||||
}
|
||||
// dojo.debug("alfresco_TinyMCE_urlconverter_callback('" + href + "', ... , " + onsave + ") = " + result);
|
||||
return result;
|
||||
}
|
||||
|
||||
function alfresco_TinyMCE_execcommand_callback(editor_id, elm, command, user_interface, value)
|
||||
|
Reference in New Issue
Block a user