1
0
Fork 0
forked from 0x2620/oxjs

merging changes

This commit is contained in:
rolux 2011-08-15 18:41:54 +02:00
commit 1ece68be42
4 changed files with 58 additions and 30 deletions

View file

@ -46,6 +46,8 @@ Ox.Dialog = function(options, self) {
self.hasButtons = !!self.options.buttons.length;
self.barsHeight = 24 + 24 * self.hasButtons;
self.initialMaxHeight = self.options.maxHeight;
self.initialMaxWidth = self.options.maxWidth;
self.titleMargin = 8 + (self.options.closeButton ? 20 : 0)
+ (self.options.maximizeButton ? 20 : 0);
@ -629,15 +631,9 @@ Ox.Dialog = function(options, self) {
return that;
};
that.fullscreen = function() {
};
that.open = function() {
self.initialHeight = self.options.height;
self.initialWidth = self.options.width;
self.initialMaxHeight = self.options.maxHeight;
self.initialMaxWidth = self.options.maxWidth;
setMinAndMax();
center();
reset();