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 HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
58212: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58182: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         58177: Merged V3.4-BUG-FIX (3.4.14) to V4.1-BUG-FIX (4.1.8)
            57174: Merged DEV to V3.4-BUG-FIX (3.4.14)
               56813: MNT-9749: AVM - copy and pasted link in TinyMCE (xs:string) renders full url and not relative URL in Firefox
                - Remove current host:port from links. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61951 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 23:06:21 +00:00
parent 75cf2df51a
commit de946c03fa
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/web-client-config-wcm.xml
View File

@@ -64,7 +64,7 @@
<param name="force_p_newlines">true</param> <param name="force_p_newlines">true</param>
<param name="forced_root_block">p</param> <param name="forced_root_block">p</param>
<param name="apply_source_formatting">true</param> <param name="apply_source_formatting">true</param>
<param name="plugins">table</param> <param name="plugins">table,paste</param>
<param name="theme_advanced_buttons3">tablecontrols</param> <param name="theme_advanced_buttons3">tablecontrols</param>
</widget> </widget>
<!-- <!--

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

@@ -61,14 +61,11 @@ function alfresco_TinyMCE_urlconverter_callback(href, element, onsave)
result = href; result = href;
} }
// handle URL issue with IE (WCM-1134) // handle URL issues(see WCM-1134 and MNT-9749)
if (navigator.appName == "Microsoft Internet Explorer" || tinyMCE.isMSIE) var server = document.location.protocol + "//" + document.location.host;
if (href.startsWith(server))
{ {
var server = document.location.protocol + "//" + document.location.host; result = href.substring(server.length);
if (href.startsWith(server))
{
result = href.substring(server.length);
}
} }
} }