Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 5a8f6ee635
commit e60d57ea42
70 changed files with 7094 additions and 1988 deletions

View File

@@ -30,6 +30,9 @@ if (!alfresco.log)
alfresco.log = alfresco.constants.DEBUG ? log : Class.empty;
}
//MNT-2080: AVM_WEBAPP url rendering in the html view of TinyMCE editor
tinyMCE.avmWebappUrl = alfresco.constants.AVM_WEBAPP_URL;
function alfresco_TinyMCE_urlconverter_callback(href, element, onsave)
{
var result = null;
@@ -47,7 +50,7 @@ function alfresco_TinyMCE_urlconverter_callback(href, element, onsave)
}
else if (href.startsWith("/"))
{
result = alfresco.constants.AVM_WEBAPP_URL + href;
result = alfresco.constants.AVM_WEBAPP_URL + href;
}
else if (href.startsWith(document.location.href))
{