Merged V3.2 to HEAD

16725: Merged V3.1 to V3.2
      16721: Merged DEV/BELARUS/V3.1 to V3.1 
         16483: Fix for ETHREEOH-2728 : WCM - Forms rendering issue using IE6
   16889: Merged V3.1 to V3.2
      16888: Merged V2.2 to V3.1 
         16694: Fix for ETHREEOH-1384/ACT 11135: Poor performance when using webscript based web forms 
         16787: Fixed Web-Client Eclipse project after recent chiba JAR file name change 
         16840: Resolution to issue in ETHREEOH-2633: Change to Common.js function implemented in CHK-5134 causes problems with missing icons in Navigator panel. Implemented configuration approach so that both modes can be supported. 
         16870: Fix for ETWOTWO-119 & ALFCOM-332: WCM config override issues where the OOTB web-client-config-wcm.xml file needed to be changed and the ability to define custom scripts to load to avoid the need to edit xforms.js or XFormsProcessor.java

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/web/scripts/ajax/common.js

@@ -10,6 +10,7 @@ if (typeof Alfresco == "undefined")
    var Alfresco = {};
 }
 
+var _checkContextAgainstPath = false;
 var _alfContextPath = null;
 
 
@@ -81,20 +82,36 @@ function handleErrorYahoo(e)
    }
 }
 
+/**
+ * Determines whether the setContextPath method below should
+ * check the provided context path against the URLs path
+ */
+function setCheckContextAgainstPath(checkContextAgainstPath)
+{
+   _checkContextAgainstPath = checkContextAgainstPath;
+}
+
 /**
  * Sets the context path to use, useful for portals where 
  * the URL can be different from the app's context path.
  */
 function setContextPath(contextPath)
 {
-   if (window.location.pathname.indexOf(contextPath) == 0 ) 
-   { 
-      _alfContextPath = contextPath; 
-   } 
-   else 
-   { 
-      _alfContextPath = ""; 
-   } 
+   if (_checkContextAgainstPath)
+   {
+      if (window.location.pathname.indexOf(contextPath) == 0 ) 
+      { 
+         _alfContextPath = contextPath; 
+      } 
+      else 
+      { 
+         _alfContextPath = ""; 
+      }
+   }
+   else
+   {
+      _alfContextPath = contextPath;
+   }
 }
 
 /**