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

swap the meaning of makeArray and toArray: makeArray, like makeObject, is a helper function for arguments processing (that wraps any non-array in an array), toArray, like in other libraries, is an alias for Array.prototype.slice.call

Browse source
This commit is contained in:
rolux 2012-05-19 12:40:59 +04:00
commit 5692195509
21 changed files with 88 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

12
source/Ox/js/Array.js
View file

@ -238,7 +238,7 @@ Ox.api = function(items, options) {
return conditions.map(function(condition) {
var key = condition.key,
operator = condition.operator,
values = Ox.toArray(condition.value);
values = Ox.makeArray(condition.value);
if (condition.conditions) {
condition.conditions = parseConditions(condition.conditions);
} else {
@ -370,9 +370,9 @@ Ox.merge <f> Merges an array with one or more other arrays
@*/
// FIXME: a1.push.apply(a1, a2) should be much faster
Ox.merge = function(arr) {
arr = Ox.toArray(arr);
arr = Ox.makeArray(arr);
Ox.forEach(Array.prototype.slice.call(arguments, 1), function(arg) {
Ox.forEach(Ox.toArray(arg), function(val) {
Ox.forEach(Ox.makeArray(arg), function(val) {
arr.push(val);
});
});
@ -406,7 +406,7 @@ Ox.range <f> Python-style range
@*/
Ox.range = function() {
var arr = [];
Ox.loop.apply(null, Ox.merge(Ox.makeArray(arguments), function(i) {
Ox.loop.apply(null, Ox.merge(Ox.toArray(arguments), function(i) {
arr.push(i);
}));
return arr;
@ -504,7 +504,7 @@ Ox.range = function() {
@*/
Ox.sortBy = function(arr, by, fn) {
var values = {};
by = Ox.toArray(by);
by = Ox.makeArray(by);
fn = fn || {};
by = by.map(function(v) {
return Ox.isString(v) ? {
@ -562,7 +562,7 @@ Ox.zip <f> Zips an array of arrays
[[0, 3], [1, 4], [2, 5]]
@*/
Ox.zip = function() {
var args = arguments.length == 1 ? arguments[0] : Ox.makeArray(arguments),
var args = arguments.length == 1 ? arguments[0] : Ox.toArray(arguments),
arr = [];
args[0].forEach(function(v, i) {
arr[i] = [];