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.Map.js
View file

@ -221,11 +221,11 @@ Ox.Map = function(options, self) {
self.mapHeight = getMapHeight();
self.metaKey = false;
self.minZoom = getMinZoom();
self.placeKeys = Ox.merge([
self.placeKeys = [
'id', 'name', 'alternativeNames', 'geoname', 'countryCode', 'type',
'lat', 'lng', 'south', 'west', 'north', 'east', 'area',
'editable'
], self.options.keys);
].concat(self.options.keys);
self.resultPlace = null;
self.scaleMeters = [
50000000, 20000000, 10000000,
@ -937,7 +937,7 @@ Ox.Map = function(options, self) {
self.options.places({
keys: self.placeKeys,
query: {
conditions: Ox.merge([
conditions: [].concat([
{key: 'lat', value: [south, north], operator: '='}
], spansGlobe() ? [
{key: 'lng', value: [-180, 180], operator: '='}