r2891 - positionTo: reverted changes from r2889
Author: joern.zaefferer
Date: Wed Jul 8 04:17:32 2009
New Revision: 2891
Modified:
branches/dev/positionTo/ui/ui.positionTo.js
Log:
positionTo: reverted changes from r2889
Modified: branches/dev/positionTo/ui/ui.positionTo.js
==============================================================================
--- branches/dev/positionTo/ui/ui.positionTo.js (original)
+++ branches/dev/positionTo/ui/ui.positionTo.js Wed Jul 8 04:17:32 2009
@@ -126,7 +126,7 @@
targetHeight: targetHeight,
elemWidth: elemWidth,
elemHeight: elemHeight,
- offset: [-2 * offset[0], -2 * offset[1]],
+ offset: offset,
my: options.my,
at: options.at
}));
@@ -154,15 +154,17 @@
flip: {
left: function(position, data) {
- var over = position.left + data.elemWidth - $(window).width() -
$(window).scrollLeft();
- var myOffset = data.my[0] == 'left' ? -data.elemWidth : data.elemWidth;
- position.left += position.left < 0 ? myOffset + data.targetWidth +
data.offset[0] : over > 0 ? myOffset - data.targetWidth + data.offset[0] :
0;
+ var over = position.left + data.elemWidth - $(window).width() -
$(window).scrollLeft(),
+ myOffset = data.my[0] == 'left' ? -data.elemWidth : data.elemWidth,
+ offset = -2 * data.offset[0];
+ position.left += position.left < 0 ? myOffset + data.targetWidth +
offset : over > 0 ? myOffset - data.targetWidth + offset : 0;
},
top: function(position, data) {
- var over = position.top + data.elemHeight - $(window).height() -
$(window).scrollTop();
- var myOffset = data.my[1] == 'top' ? -data.elemHeight : data.elemHeight;
- var atOffset = data.at[1] == 'top' ? data.targetHeight :
-data.targetHeight;
- position.top += position.top < 0 ? myOffset + data.targetHeight +
data.offset[1] : over > 0 ? myOffset + atOffset + data.offset[1] : 0;
+ var over = position.top + data.elemHeight - $(window).height() -
$(window).scrollTop(),
+ myOffset = data.my[1] == 'top' ? -data.elemHeight : data.elemHeight,
+ atOffset = data.at[1] == 'top' ? data.targetHeight :
-data.targetHeight,
+ offset = -2 * data.offset[1];
+ position.top += position.top < 0 ? myOffset + data.targetHeight +
offset : over > 0 ? myOffset + atOffset + offset : 0;
}
}
};