Author: ivassile Date: 2013-12-09 21:30:34 -0500 (Mon, 09 Dec 2013) New Revision: 23272 Modified: branches/enterprise/3.3.1.SP4/samples/editor-sample/ branches/enterprise/3.3.1.SP4/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js Log: Integrating richfaces/branches/enterprise/3.3.1.SP3_RFPL-1631 Property changes on: branches/enterprise/3.3.1.SP4/samples/editor-sample ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: branches/enterprise/3.3.1.SP4/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js =================================================================== --- branches/enterprise/3.3.1.SP4/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2013-12-09 16:23:02 UTC (rev 23271) +++ branches/enterprise/3.3.1.SP4/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2013-12-10 02:30:34 UTC (rev 23272) @@ -521,6 +521,7 @@ var parOffset = Position.cumulativeOffset(this.element); var divOffset = Position.cumulativeOffset(innerDiv); + var scrollOffset = Position.realOffset(this.element); var deltaX = divOffset[0] - parOffset[0]; var deltaY = divOffset[1] - parOffset[1]; @@ -571,8 +572,8 @@ if (!foundPos) { layerPos = this.calcPosition(listPos[0].jointPoint, listPos[0].direction) } - this.layer.style.left = layerPos.left + hOffset - deltaX - this.left + "px"; - this.layer.style.top = layerPos.top + vOffset - deltaY - this.top + "px"; + this.layer.style.left = layerPos.left + hOffset - deltaX - this.left - scrollOffset[0] + "px"; + this.layer.style.top = layerPos.top + vOffset - deltaY - this.top - scrollOffset[1] + "px"; this.layer.style.width = this.layer.clientWidth + "px";