sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

Ox.UI -> Ox

Browse source
This commit is contained in:
rlx 2014-09-25 18:35:17 +02:00
commit 775aa607c8
13 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/Ox.UI/js/Menu/Menu.js
View file

@ -788,7 +788,7 @@ Ox.Menu = function(options, self) {
if (!that.is(':hidden')) {
return;
}
that.parent().length == 0 && that.appendTo(Ox.UI.$body);
that.parent().length == 0 && that.appendTo(Ox.$body);
that.css({
left: '-1000px',
top: '-1000px'
@ -797,13 +797,13 @@ Ox.Menu = function(options, self) {
width = self.options.element.outerWidth(),
height = self.options.element.outerHeight(),
menuWidth = that.width(),
windowWidth = Ox.UI.$window.width(),
windowHeight = Ox.UI.$window.height(),
windowWidth = Ox.$window.width(),
windowHeight = Ox.$window.height(),
left = offset.left + self.options.offset.left + (self.options.edge == 'bottom' ? 0 : width),
right,
top = offset.top + self.options.offset.top + (self.options.edge == 'bottom' ? height : 0),
menuHeight = that.$content.outerHeight(), // fixme: why is outerHeight 0 when hidden?
menuMaxHeight = Math.floor(Ox.UI.$window.height() - top - 16);
menuMaxHeight = Math.floor(Ox.$window.height() - top - 16);
if (self.options.edge == 'bottom' && left + menuWidth > windowWidth) {
left = offset.left + width - menuWidth;
that.is('.OxRight') && that.removeClass('OxRight') && that.addClass('OxLeft');