inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.1 to HEAD (Fix for ETHREEOH-1211: Can't See Images in TinyMCE)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14827 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2009-06-22 12:12:24 +00:00
parent f67d1540f1
commit 9501f21795
1 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
source/web/scripts/ajax/tiny_mce_wcm_extensions.js vendored
View File

@@ -26,40 +26,49 @@
////////////////////////////////////////////////////////////////////////////////
if (!alfresco.log)
{
alfresco.log = alfresco.constants.DEBUG ? log : Class.empty;
alfresco.log = alfresco.constants.DEBUG ? log : Class.empty;
}
function alfresco_TinyMCE_urlconverter_callback(href, element, onsave)
{
var result = null;
if (onsave)
{
result = (href && href.startsWith(alfresco.constants.AVM_WEBAPP_URL)
? href.substring(alfresco.constants.AVM_WEBAPP_URL.length)
: href);
}
else
{
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);
}
alfresco.log("element = " + element);
// handle URL issue with IE (WCM-1134)
if (tinyMCE.isMSIE)
// NOTE: since upgrade of TinyMCE to v3 'onsave' now seems to always = true
if (href)
{
var server = document.location.protocol + "//" + document.location.host;
if (href && href.startsWith(server))
{
if (href.startsWith(alfresco.constants.AVM_WEBAPP_URL))
{
result = href.substring(alfresco.constants.AVM_WEBAPP_URL.length);
}
else if (href.startsWith("/"))
{
result = alfresco.constants.AVM_WEBAPP_URL + href;
}
else if (href.startsWith(document.location.href))
{
result = href.substring(document.location.href.length);
}
else
{
result = href;
}
// handle URL issue with IE (WCM-1134)
if (tinyMCE.isMSIE)
{
var server = document.location.protocol + "//" + document.location.host;
if (href.startsWith(server))
{
result = href.substring(server.length);
}
}
}
}
// dojo.debug("alfresco_TinyMCE_urlconverter_callback('" + href + "', ... , " + onsave + ") = " + result);
alfresco.log("alfresco_TinyMCE_urlconverter_callback('" + href + "', ... , " + onsave + ") = " + result);
return result;
}