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

merging changes

Browse source
This commit is contained in:
rlx 2011-06-01 18:38:58 +00:00
parent 2ce322fe97
commit 3e03e00a72
2 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -419,12 +419,23 @@ Ox.Filter = function(options, self) {
id: 'start', id: 'start',
width: 112 width: 112
}), }),
/*
Ox.TimeInput({
id: 'start',
//seconds: true,
width: {
hours: 38,
minutes: 37,
seconds: 37
}
}),
*/
Ox.DateInput({ Ox.DateInput({
id: 'end', id: 'end',
width: { width: {
day: 27, day: 32,
month: 27, month: 32,
year: 42 year: 48
} }
}) })
], ],

17
source/Ox.UI/js/Form/Ox.TimeInput.js
View file

@ -23,6 +23,13 @@ Ox.TimeInput = function(options, self) {
seconds: false, seconds: false,
milliseconds: false, milliseconds: false,
value: Ox.formatDate(new Date(), '%T'), value: Ox.formatDate(new Date(), '%T'),
width: {
hours: 32,
minutes: 32,
seconds: 32,
milliseconds: 40,
ampm: 32
}
}) })
.options(options || {}); .options(options || {});
@ -46,7 +53,7 @@ Ox.TimeInput = function(options, self) {
id: 'hours', id: 'hours',
textAlign: 'right', textAlign: 'right',
value: self.values.hours, value: self.values.hours,
width: 32 width: self.options.width.hours
}), }),
minutes: new Ox.Input({ minutes: new Ox.Input({
autocomplete: $.map(Ox.range(0, 60), function(v) { autocomplete: $.map(Ox.range(0, 60), function(v) {
@ -57,7 +64,7 @@ Ox.TimeInput = function(options, self) {
id: 'minutes', id: 'minutes',
textAlign: 'right', textAlign: 'right',
value: self.values.minutes, value: self.values.minutes,
width: 32 width: self.options.width.minutes
}), }),
seconds: new Ox.Input({ seconds: new Ox.Input({
autocomplete: $.map(Ox.range(0, 60), function(v) { autocomplete: $.map(Ox.range(0, 60), function(v) {
@ -68,7 +75,7 @@ Ox.TimeInput = function(options, self) {
id: 'seconds', id: 'seconds',
textAlign: 'right', textAlign: 'right',
value: self.values.seconds, value: self.values.seconds,
width: 32 width: self.options.width.seconds
}), }),
milliseconds: new Ox.Input({ milliseconds: new Ox.Input({
autocomplete: $.map(Ox.range(0, 1000), function(v) { autocomplete: $.map(Ox.range(0, 1000), function(v) {
@ -79,7 +86,7 @@ Ox.TimeInput = function(options, self) {
id: 'milliseconds', id: 'milliseconds',
textAlign: 'right', textAlign: 'right',
value: self.values.milliseconds, value: self.values.milliseconds,
width: 40 width: self.options.width.milliseconds
}), }),
ampm: new Ox.Input({ ampm: new Ox.Input({
autocomplete: ['AM', 'PM'], autocomplete: ['AM', 'PM'],
@ -87,7 +94,7 @@ Ox.TimeInput = function(options, self) {
autocompleteReplaceCorrect: true, autocompleteReplaceCorrect: true,
id: 'ampm', id: 'ampm',
value: self.values.ampm, value: self.values.ampm,
width: 32 width: self.options.width.seconds
}) })
}; };