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

filter: add 'item' type (select), fix sizes

Browse source
This commit is contained in:
rolux 2014-05-18 02:46:03 +02:00
parent 8c4e7fbe84
commit c593955e8c
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/Ox.UI/js/Form/Filter.js
View file

@ -68,6 +68,10 @@ Ox.Filter = function(options, self) {
{id: '=,', title: Ox._('is between')}, {id: '=,', title: Ox._('is between')},
{id: '!=,', title: Ox._('is not between')} {id: '!=,', title: Ox._('is not between')}
], ],
item: [
{id: '==', title: Ox._('is')},
{id: '!==', title: Ox._('is not')}
],
list: [ list: [
{id: '==', title: Ox._('is')}, {id: '==', title: Ox._('is')},
{id: '!==', title: Ox._('is not')} {id: '!==', title: Ox._('is not')}
@ -114,6 +118,7 @@ Ox.Filter = function(options, self) {
float: 0, float: 0,
hue: 0, hue: 0,
integer: 0, integer: 0,
item: void 0,
list: '', list: '',
string: '', string: '',
text: '', text: '',
@ -691,6 +696,12 @@ Ox.Filter = function(options, self) {
value: value, value: value,
width: !isArray ? 288 : 128 width: !isArray ? 288 : 128
}); });
} else if (type == 'item') {
$input = Ox.Select({
items: findKey.values,
value: value,
width: 288
});
} else if (type == 'list') { } else if (type == 'list') {
Ox.Log('FILTER', findKey) Ox.Log('FILTER', findKey)
$input = Ox.Input({ $input = Ox.Input({
@ -771,7 +782,7 @@ Ox.Filter = function(options, self) {
Ox.Input({ Ox.Input({
type: type, type: type,
value: value, value: value,
width: !isArray ? 240 : 80 width: !isArray ? 242 : 80
}), }),
formatType == 'value' ? Ox.Select({ formatType == 'value' ? Ox.Select({
overlap: 'left', overlap: 'left',