From 889ad7a83afdedafd58c18503ee9c541fb2fe812 Mon Sep 17 00:00:00 2001 From: rolux Date: Wed, 13 Jun 2012 15:55:34 +0200 Subject: [PATCH] in ObjectInput and ObjectArrayInput, don't set height --- source/Ox.UI/js/Form/ObjectArrayInput.js | 6 ++---- source/Ox.UI/js/Form/ObjectInput.js | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/source/Ox.UI/js/Form/ObjectArrayInput.js b/source/Ox.UI/js/Form/ObjectArrayInput.js index 3cacf31a..ce5009ce 100644 --- a/source/Ox.UI/js/Form/ObjectArrayInput.js +++ b/source/Ox.UI/js/Form/ObjectArrayInput.js @@ -48,7 +48,6 @@ Ox.ObjectArrayInput = function(options, self) { self.$element.splice(index, 0, Ox.Element() .css({ width: self.options.width + 'px', - height: (self.options.inputs.length + 1) * 24 - 8 + 'px' }) ); if (index == 0) { @@ -81,7 +80,7 @@ Ox.ObjectArrayInput = function(options, self) { title: self.options.buttonTitles.remove, width: self.buttonWidth }) - .css({float: 'left', margin: '8px 4px 0 0'}) + .css({margin: '8px 4px 0 0'}) .on({ click: function() { var index = $(this).parent().data('index'); @@ -101,7 +100,7 @@ Ox.ObjectArrayInput = function(options, self) { title: self.options.buttonTitles.add, width: self.buttonWidth }) - .css({float: 'left', margin: '8px 0 0 4px'}) + .css({margin: '8px 0 0 4px'}) .on({ click: function() { var index = $(this).parent().data('index'); @@ -149,7 +148,6 @@ Ox.ObjectArrayInput = function(options, self) { value.forEach(function(value, i) { addInput(i, value); }); - } function updateInputs() { diff --git a/source/Ox.UI/js/Form/ObjectInput.js b/source/Ox.UI/js/Form/ObjectInput.js index a82acdad..68b401a9 100644 --- a/source/Ox.UI/js/Form/ObjectInput.js +++ b/source/Ox.UI/js/Form/ObjectInput.js @@ -25,7 +25,6 @@ Ox.ObjectInput = function(options, self) { .addClass('OxObjectInput') .css({ width: self.options.width + 'px', - height: self.options.elements.length * 24 - 8 + 'px' }); if (Ox.isEmpty(self.options.value)) {