0x2620/oxjs
2
0
Fork 2
Code Issues 172 Pull requests Releases Wiki 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/js/Array.js
View file

@ -140,7 +140,7 @@ Ox.api = function(items, options) {
}
if (options.sort && result.data.items.length > 1) {
// sort
options.sort = parseSort(Ox.merge(Ox.clone(options.sort), api.sort));
options.sort = parseSort(options.sort.concat(api.sort));
options.sort.forEach(function(v) {
var key = v.key;
if (api.enums[key]) {
@ -417,7 +417,7 @@ Ox.range <f> Python-style range
@*/
Ox.range = function() {
var arr = [];
Ox.loop.apply(null, Ox.merge(Ox.toArray(arguments), function(i) {
Ox.loop.apply(null, Ox.toArray(arguments).concat(function(i) {
arr.push(i);
}));
return arr;
@ -433,7 +433,7 @@ Ox.range = function() {
var match;
if (Ox.isString(val)) {
match = arr_[i].match(/\d+/g);
match && Ox.merge(matches, match);
match && matches.concat(match);
}
});
// get length of longest number