0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

in ObjectInput and ObjectArrayInput, don't set height

Browse source
This commit is contained in:
rolux 2012-06-13 15:55:34 +02:00
parent a874974f9a
commit 889ad7a83a
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/Ox.UI/js/Form/ObjectArrayInput.js
View file

@ -48,7 +48,6 @@ Ox.ObjectArrayInput = function(options, self) {
self.$element.splice(index, 0, Ox.Element() self.$element.splice(index, 0, Ox.Element()
.css({ .css({
width: self.options.width + 'px', width: self.options.width + 'px',
height: (self.options.inputs.length + 1) * 24 - 8 + 'px'
}) })
); );
if (index == 0) { if (index == 0) {
@ -81,7 +80,7 @@ Ox.ObjectArrayInput = function(options, self) {
title: self.options.buttonTitles.remove, title: self.options.buttonTitles.remove,
width: self.buttonWidth width: self.buttonWidth
}) })
.css({float: 'left', margin: '8px 4px 0 0'}) .css({margin: '8px 4px 0 0'})
.on({ .on({
click: function() { click: function() {
var index = $(this).parent().data('index'); var index = $(this).parent().data('index');
@ -101,7 +100,7 @@ Ox.ObjectArrayInput = function(options, self) {
title: self.options.buttonTitles.add, title: self.options.buttonTitles.add,
width: self.buttonWidth width: self.buttonWidth
}) })
.css({float: 'left', margin: '8px 0 0 4px'}) .css({margin: '8px 0 0 4px'})
.on({ .on({
click: function() { click: function() {
var index = $(this).parent().data('index'); var index = $(this).parent().data('index');
@ -149,7 +148,6 @@ Ox.ObjectArrayInput = function(options, self) {
value.forEach(function(value, i) { value.forEach(function(value, i) {
addInput(i, value); addInput(i, value);
}); });
} }
function updateInputs() { function updateInputs() {

1
source/Ox.UI/js/Form/ObjectInput.js
View file

@ -25,7 +25,6 @@ Ox.ObjectInput = function(options, self) {
.addClass('OxObjectInput') .addClass('OxObjectInput')
.css({ .css({
width: self.options.width + 'px', width: self.options.width + 'px',
height: self.options.elements.length * 24 - 8 + 'px'
}); });
if (Ox.isEmpty(self.options.value)) { if (Ox.isEmpty(self.options.value)) {