From 7747255ab8553ac6ae8d15c6711e5f57c48477d1 Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Wed, 2 Nov 2011 08:22:55 +0000 Subject: [PATCH] fix a bug in split panel, regarding the size of a second element in relation to a collapsed third element --- source/Ox.UI/js/Core/Ox.JQueryElement.js | 4 ++-- source/Ox.UI/js/Panel/Ox.SplitPanel.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/Ox.UI/js/Core/Ox.JQueryElement.js b/source/Ox.UI/js/Core/Ox.JQueryElement.js index 30b6a0c5..780cf7a1 100644 --- a/source/Ox.UI/js/Core/Ox.JQueryElement.js +++ b/source/Ox.UI/js/Core/Ox.JQueryElement.js @@ -14,9 +14,9 @@ Ox.JQueryElement Wrapper for jQuery Ox.JQueryElement = function($element) { var that = this; //@ id Unique id - that.id = Ox.uid(); + that.id = Ox.uid(); // fixme: rename to oxid! //@ ox OxJS version - that.ox = Ox.VERSION; + that.ox = Ox.VERSION; // fixme: remove! //@ $element The jQuery-wrapped DOM element that.$element = $element.data({ oxid: that.id diff --git a/source/Ox.UI/js/Panel/Ox.SplitPanel.js b/source/Ox.UI/js/Panel/Ox.SplitPanel.js index db353b6a..a564c57b 100644 --- a/source/Ox.UI/js/Panel/Ox.SplitPanel.js +++ b/source/Ox.UI/js/Panel/Ox.SplitPanel.js @@ -142,7 +142,7 @@ Ox.SplitPanel = function(options, self) { css[self.edges[0]] = 'auto'; // fixme: why is this needed? } css[self.edges[1]] = ( - self.length == 3 ? getVisibleSize(self.options.elements[2]) : 0 + self.length == 3 ? getSize(self.options.elements[2]) : 0 ) + 'px'; } else { if (element.size == 'auto') {