From de946c03fa1ca3b6c27c678b26f91c7c8ecab4b9 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Tue, 11 Feb 2014 23:06:21 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    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
---
 config/alfresco/web-client-config-wcm.xml          |  2 +-
 source/web/scripts/ajax/tiny_mce_wcm_extensions.js | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/config/alfresco/web-client-config-wcm.xml b/config/alfresco/web-client-config-wcm.xml
index 1065310863..41078f2394 100644
--- a/config/alfresco/web-client-config-wcm.xml
+++ b/config/alfresco/web-client-config-wcm.xml
@@ -64,7 +64,7 @@
              <param name="force_p_newlines">true</param>
              <param name="forced_root_block">p</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>
            </widget>
            <!--
diff --git a/source/web/scripts/ajax/tiny_mce_wcm_extensions.js b/source/web/scripts/ajax/tiny_mce_wcm_extensions.js
index 653c6e2aa8..13bb713493 100644
--- a/source/web/scripts/ajax/tiny_mce_wcm_extensions.js
+++ b/source/web/scripts/ajax/tiny_mce_wcm_extensions.js
@@ -61,14 +61,11 @@ function alfresco_TinyMCE_urlconverter_callback(href, element, onsave)
       result = href;
     }
   
-    // handle URL issue with IE (WCM-1134)
-    if (navigator.appName == "Microsoft Internet Explorer" || tinyMCE.isMSIE)
+    // handle URL issues(see WCM-1134 and MNT-9749)
+    var server = document.location.protocol + "//" + document.location.host;
+    if (href.startsWith(server))
     {
-      var server = document.location.protocol + "//" + document.location.host;
-      if (href.startsWith(server))
-      {
-        result = href.substring(server.length);
-      }
+      result = href.substring(server.length);
     }
   }