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

14
source/Ox.UI/js/Map/Ox.MapMarkerImage.js
View file

@ -30,16 +30,14 @@ Ox.MapMarkerImage = (function() {
if (!cache[index]) {
var color = options.rectangle ? [0, 0, 0, 0]
: Ox.merge(
Ox.clone(options.color),
: options.color.concat(
[options.type == 'place' ? 0.75 : 0.25]
),
border = Ox.merge(
options.mode == 'normal' ? [0, 0, 0]
: options.mode == 'selected' ? [255, 255, 255]
: [128, 128, 255],
[options.type == 'result' ? 0.5 : 1]
),
border = (
options.mode == 'normal' ? [0, 0, 0]
: options.mode == 'selected' ? [255, 255, 255]
: [128, 128, 255]
).concat([options.type == 'result' ? 0.5 : 1]),
c = Ox.canvas(options.size, options.size),
image,
r = options.size / 2;