sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

use [].concat, not Ox.merge

Browse source
This commit is contained in:
rolux 2012-05-24 09:45:33 +02:00
commit 1c40fb007b
27 changed files with 87 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

6
source/Ox.UI/js/Map/Ox.ListMap.js
View file

@ -473,7 +473,7 @@ Ox.ListMap = function(options, self) {
self.$placeData = Ox.Element();
self.$placeForm = Ox.Form({
items: Ox.merge([
items: [].concat([
self.$nameInput = Ox.Input({
id: 'name',
label: 'Name',
@ -1043,7 +1043,7 @@ Ox.ListMap = function(options, self) {
showForm(place);
if (self.options.hasMatches) {
self.$matchesInput.value('').show();
names = Ox.filter(Ox.merge([place.name], place.alternativeNames), function(name) {
names = Ox.filter([place.name].concat(place.alternativeNames), function(name) {
return name !== '';
});
self.options.getMatches(names, function(matches) {
@ -1100,7 +1100,7 @@ Ox.ListMap = function(options, self) {
function updateList(key, value) {
var query = {
conditions: Ox.merge(
conditions: [].concat(
['all', 'name'].indexOf(key) > -1
? [{key: 'name', value: value, operator: '='}] : [],
['all', 'alternativeNames'].indexOf(key) > -1