Author: konstantin.mishin Date: 2010-02-05 11:20:43 -0500 (Fri, 05 Feb 2010) New Revision: 16421 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js Log: RF-7868 RF-7869 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-02-05 05:51:52 UTC (rev 16420) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-02-05 16:20:43 UTC (rev 16421) @@ -46,7 +46,7 @@ import org.richfaces.component.util.HtmlUtil; @ResourceDependencies({ @ResourceDependency(library = "javax.faces", name = "jsf.js"), - @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"), + @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "jquery.position.js"), @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "extendedDataTable.js"), @ResourceDependency(name = "extendedDataTable.css") }) public class ExtendedDataTableRenderer extends AbstractTableRenderer { Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-02-05 05:51:52 UTC (rev 16420) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/extendedDataTable.js 2010-02-05 16:20:43 UTC (rev 16421) @@ -140,7 +140,7 @@ }; var drag = function(event) { - dragElement.style.left = (Math.max(resizeData.left + MIN_WIDTH, event.pageX) - jQuery(dragElement).offsetParent().offset().left) + "px"; + jQuery(dragElement).setPosition({left:Math.max(resizeData.left + MIN_WIDTH, event.pageX)}); return false; }; var beginResize = function(event) { @@ -151,8 +151,7 @@ left : thisElement.parent().offset().left }; dragElement.style.height = element.clientHeight + "px"; - dragElement.style.top = thisElement.offset().top - thisElement.offsetParent().offset().top + "px"; - dragElement.style.left = (event.pageX - jQuery(element).offsetParent().offset().left) + "px"; + jQuery(dragElement).setPosition({top:thisElement.offset().top, left:event.pageX}); dragElement.style.display = "block"; jQuery(document).bind("mousemove", drag); jQuery(document).one("mouseup", endResize); @@ -176,9 +175,8 @@ }; var reorder = function(event) { + jQuery(reorderElement).setPosition(event, {offset:[5,5]}); reorderElement.style.display = "block"; - reorderElement.style.top = (event.pageY - jQuery(reorderElement).offsetParent().offset().top) + "px"; - reorderElement.style.left = (event.pageX - jQuery(reorderElement).offsetParent().offset().left + 20) + "px"; return false; };