Merged V2.1 to HEAD:

6556: AVM performance tweaks
   6557: WCM-758.
   6558: Fixes WCM-753.
   6559: better handling of rename, copy and paste for form instance data and renditions.  addresses WCM-752 and partially addresses WCM-559.
   6560: Renamed JndiTest.java until we decide to keep it or not.
   6561: Oops.
   6562: probable fix WCM-669      
   6563: Build fix after the removal of flushing suport 
   6564: Fix for WCM-728
   6566: Support for avm index clustering via tracking - WCM-762
   6567: Test fix after flush changes
   6568: Fixed AWC-1517: Can now create space based on existing top-level space
   6569: misc IE fixes.
   6570: Various changes to improve AVM import performance and submit performance.
   6571: Session flushing is now deprecated and doesn't fail with an exception.
   6572: Reduced the iteration count to stress nextResults calls a bit more
   6573: WS query sessions put back into cache after more results have been fetched.
   6574: AR-1347: RepositoryServiceSoapBindingStub.queryAssociated() returns nothing when direction=target
   6575: Fixed AR-1680: XPath metadata extraction now handles Node, NodeList and String return values
   6577: Fix for AWC-1518 (User Homes renaming issue, and unreported issue with client config overriding of users home location)


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

source/web/scripts/ajax/xforms.js

@@ -888,7 +888,7 @@ dojo.declare("alfresco.xforms.RichTextEditor",
                {
                  attach_point.appendChild(this.domNode);
                  dojo.html.prependClass(this.domNode, "xformsTextArea");
-                 if (this._params["height"])
+                 if (this._params.height)
                  {
                    this.domNode.style.height = parseInt(this._params["height"]) + "px";
                  }
@@ -1032,7 +1032,11 @@ dojo.declare("alfresco.xforms.RichTextEditor",
                  if (this.hoverLayer.parentNode != this.widget)
                  {
                    this.widget.appendChild(this.hoverLayer);
+                   
+                   this.hoverLayer.style.border = "1px solid black";
                    this.hoverLayer.style.lineHeight = this.hoverLayer.offsetHeight + "px";
+                   this.hoverLayer.style.overflow = "hidden";
+                   dojo.html.setOpacity(this.hoverLayer, .8);
                    var me = this;
                    dojo.event.browser.addListener(this.hoverLayer, 
                                                   "onmouseout", 
@@ -1050,6 +1054,7 @@ dojo.declare("alfresco.xforms.RichTextEditor",
                {
                  if (this.hoverLayer.parentNode == this.widget)
                  {
+                   dojo.html.setOpacity(this.hoverLayer, 1);
                    this.widget.removeChild(this.hoverLayer);
                  }
                },
@@ -1058,12 +1063,48 @@ dojo.declare("alfresco.xforms.RichTextEditor",
                {
                  if (this.hoverLayer.parentNode == this.widget)
                  {
+                   dojo.html.setOpacity(this.hoverLayer, 1);
                    this.widget.removeChild(this.hoverLayer);
                    this._createTinyMCE();
                  }
                }
              });
 
+/** 
+ * Reads the widget configuration to determine which plugins will 
+ * be needed by tinymce.  All plugins must be loaded into tinymce at
+ * startup so they must be accumulated in advance.
+ */
+alfresco.xforms.RichTextEditor.determineNecessaryTinyMCEPlugins = function(config)
+{
+  var result = [];
+  for (var widget in config)
+  {
+    for (var schemaType in config[widget])
+    {
+      for (var appearance in config[widget][schemaType])
+      {
+        if (config[widget][schemaType][appearance].className == "alfresco.xforms.RichTextEditor" &&
+            config[widget][schemaType][appearance].params &&
+            config[widget][schemaType][appearance].params.plugins)
+        {
+          dojo.debug("found plugins definition " +  config[widget][schemaType][appearance].params.plugins +
+                     " for text editor at  config[" + widget + "][" + schemaType + "][" + appearance + "]");
+          var plugins = config[widget][schemaType][appearance].params.plugins.split(",");
+          for (var p = 0; p < plugins.length; p++)
+          {
+            if (result.indexOf(plugins[p]) < 0)
+            {
+              result.push(plugins[p]);
+            }
+          }
+        }
+      }
+    }
+  }
+  return result.join(",");
+}
+
 /** Base class for all select widgets. */
 dojo.declare("alfresco.xforms.AbstractSelectWidget",
              alfresco.xforms.Widget,
@@ -4072,7 +4113,7 @@ dojo.declare("alfresco.xforms.XForm",
                                    " schemaType " + schemaType +
                                    " appearance " + appearance);
                  }
-                 var result = new cstr(this, xformsNode, x.params);
+                 var result = new cstr(this, xformsNode, dojo.lang.mixin(new Object(), x.params || {}));
                  if (result instanceof alfresco.xforms.Widget)
                  {
                    return result;
@@ -4668,11 +4709,14 @@ dojo.html.toCamelCase = function(str)
 // tiny mce integration
 ////////////////////////////////////////////////////////////////////////////////
 
+alfresco.constants.TINY_MCE_DEFAULT_PLUGINS = 
+  alfresco.xforms.RichTextEditor.determineNecessaryTinyMCEPlugins(alfresco.xforms.widgetConfig);
+
 alfresco.constants.TINY_MCE_DEFAULT_SETTINGS = 
 {
   theme: "advanced",
   mode: "exact",
-  plugins: "table",
+  plugins: alfresco.constants.TINY_MCE_DEFAULT_PLUGINS,
   width: -1,
   height: -1,
   auto_resize: false,