forked from 0x2620/oxjs
use [].concat, not Ox.merge
This commit is contained in:
parent
36d0162b8b
commit
1c40fb007b
27 changed files with 87 additions and 90 deletions
|
|
@ -91,7 +91,7 @@ Ox.TimeInput = function(options, self) {
|
|||
|
||||
that = Ox.InputGroup(Ox.extend(self.options, {
|
||||
id: self.options.id,
|
||||
inputs: Ox.merge([
|
||||
inputs: [].concat([
|
||||
self.$input.hours,
|
||||
self.$input.minutes,
|
||||
], self.options.seconds ? [
|
||||
|
|
@ -102,7 +102,7 @@ Ox.TimeInput = function(options, self) {
|
|||
self.$input.ampm
|
||||
] : []),
|
||||
join: join,
|
||||
separators: Ox.merge([
|
||||
separators: [].concat([
|
||||
{title: ':', width: 8},
|
||||
], self.options.seconds ? [
|
||||
{title: ':', width: 8}
|
||||
|
|
@ -156,7 +156,7 @@ Ox.TimeInput = function(options, self) {
|
|||
|
||||
function split(value) {
|
||||
var values = getValues();
|
||||
return Ox.merge([
|
||||
return [].concat([
|
||||
values.hours,
|
||||
values.minutes,
|
||||
], self.options.seconds ? [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue