[richfaces-svn-commits] JBoss Rich Faces SVN: r19593 - trunk/core/impl/src/main/resources/META-INF/resources.
Author: pyaschenko
Date: 2010-10-18 11:22:42 -0400 (Mon, 18 Oct 2010)
New Revision: 19593
Modified:
trunk/core/impl/src/main/resources/META-INF/resources/jquery.position.js
Log:
https://jira.jboss.org/browse/RF-9152
https://jira.jboss.org/browse/RF-9168
Modified: trunk/core/impl/src/main/resources/META-INF/resources/jquery.position.js
===================================================================
--- trunk/core/impl/src/main/resources/META-INF/resources/jquery.position.js 2010-10-18
10:30:07 UTC (rev 19592)
+++ trunk/core/impl/src/main/resources/META-INF/resources/jquery.position.js 2010-10-18
15:22:42 UTC (rev 19593)
@@ -67,7 +67,7 @@
var stype = typeof source;
if (stype == "object" || stype == "string") {
var rect = {};
- if (stype == "string" || source.nodeType || source instanceof jQuery) {
+ if (stype == "string" || source.nodeType || source instanceof jQuery ||
typeof source.length!="undefined") {
rect = getElementRect(source);
} else if (source.type) {
rect = getPointerRect(source);
@@ -135,7 +135,34 @@
function getElementRect (element) {
var jqe = $(element);
var offset = jqe.offset();
- return {width: jqe.width(), height: jqe.height(), left: Math.floor(offset.left), top:
Math.floor(offset.top)};
+ var rect = {width: jqe.outerWidth(), height: jqe.outerHeight(), left:
Math.floor(offset.left), top: Math.floor(offset.top)};
+ if (jqe.length>1) {
+ var width, height, offset;
+ var e;
+ for (var i=1;i<jqe.length;i++) {
+ e = jqe.eq(i);
+ if (e.css('display')=="none") continue;
+ width = e.outerWidth();
+ height = e.outerHeight();
+ offset = e.offset();
+ var d = rect.left - offset.left;
+ if (d<0) {
+ rect.width = (width > rect.width) ? width : rect.width - d;
+ } else {
+ if (d + width > rect.width) rect.width = d + width;
+ }
+ var d = rect.top - offset.top;
+ if (d<0) {
+ rect.height = (height > rect.height) ? height : rect.height - d;
+ } else {
+ if (d + height > rect.height) rect.height = d + height;
+ }
+ if (offset.left < rect.left) rect.left = offset.left;
+ if (offset.top < rect.top) rect.top = offset.top;
+ }
+ }
+
+ return rect;
/*
var jqe = $(element);
var offset = jqe.offset();