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.4-BUG-FIX to HEAD

Browse Source 
32340: Fix for ALF-11737 (refix for ALF-11247) - After clicking on any list item action in Explorer there is no effect
   32341: Fix for ALF-9883 - WCM Forms: Changing 'abstract' type carries previously-added elements

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32344 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2011-11-28 12:22:30 +00:00
parent eb53b834af
commit e861c81a63
2 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/java/org/alfresco/web/ui/repo/component/UIActions.java
View File

@@ -103,10 +103,6 @@ public class UIActions extends SelfRenderingComponent
this.showLink = (Boolean)values[2];
this.verticalSpacing = (Integer)values[3];
this.groups = new HashSet<String>(4);
// when the state of the component is restored, clear the child list of components - they
// are always rebuilt on initial page render - otherwise the list will grow forever...
this.getChildren().clear();
}
/**
@@ -161,6 +157,20 @@ public class UIActions extends SelfRenderingComponent
}
}
// look to see if we built a component set for that component group on a previous render
// this will need removing from the child component set to ensure that it does not grow endlessly
for (Iterator i=getChildren().iterator(); i.hasNext(); /**/)
{
UIComponent child = (UIComponent)i.next();
if (contextId.equals(child.getAttributes().get("contextId")))
{
if (logger.isDebugEnabled())
logger.debug("***removing old child component set for contextId: " + contextId);
i.remove();
break;
}
}
String groupId = getValue();
if (groupId != null && groupId.length() != 0)
{

31
source/web/scripts/ajax/xforms.js
View File

@@ -2844,10 +2844,17 @@ alfresco.xforms.VGroup = alfresco.xforms.AbstractGroup.extend({
var contentDivWidth = "100%";
// the following does avoid devision by zero ... in contentDiv.offsetLeft / child.domContainer.offsetWidth
var ow = child.domContainer.offsetWidth;
if (!(child instanceof alfresco.xforms.AbstractGroup) && ow != 0)
if (!(child instanceof alfresco.xforms.AbstractGroup))
{
if (ow != 0)
{
contentDivWidth = ((1 - (contentDiv.offsetLeft / ow)) * 100) + "%";
}
else
{
contentDivWidth = "70%";
}
}
contentDiv.style.width = contentDivWidth;
child.render(contentDiv);
@@ -2873,7 +2880,26 @@ alfresco.xforms.VGroup = alfresco.xforms.AbstractGroup.extend({
// (.5 * contentDiv.labelNode.offsetHeight))) + "px";
contentDiv.labelNode.style.position = "relative";
contentDiv.labelNode.style.top = "0px";
if (oh)
{
contentDiv.labelNode.style.height = oh + "px";
}
else
{
var defaultHeight = 20;
if (child instanceof alfresco.xforms.RichTextEditor)
{
defaultHeight = 200;
}
contentDiv.labelNode.style.height = defaultHeight + "px";
contentDiv.style.top = "-" + defaultHeight + "px";
child.domContainer.style.height = defaultHeight + "px";
}
if (!contentDiv.labelNode.scrollWidth)
{
contentDiv.labelNode.style.width = "30%";
}
contentDiv.labelNode.style.lineHeight = contentDiv.labelNode.style.height;
}
@@ -4222,6 +4248,9 @@ alfresco.xforms.XForm = new Class({
this.rootWidget = new alfresco.xforms.ViewRoot(this, rootGroup);
this.rootWidget.render(alfUI);
//par variable is introduced for offline domNode editing, which improves performance
var par = this.rootWidget.domNode.parentNode;
par.removeChild(this.rootWidget.domNode);
this.loadWidgets(rootGroup, this.rootWidget);
},